Conserve the structure of scale items in custom scales

Woyten · Jun 21, 2020 · 2ffd5e8 · 2ffd5e8
1 parent c140f80
commit 2ffd5e8
Show file tree

Hide file tree

Showing 3 changed files with 35 additions and 11 deletions.
diff --git a/tune-cli/src/main.rs b/tune-cli/src/main.rs
@@ -14,7 +14,7 @@ use tune::key::PianoKey;
 use tune::key_map::KeyMap;
 use tune::mts::{DeviceId, SingleNoteTuningChange, SingleNoteTuningChangeMessage};
 use tune::pitch::{Pitch, ReferencePitch};
-use tune::ratio::Ratio;
+use tune::ratio::{Ratio, RatioExpression, RatioExpressionVariant};
 use tune::scale;
 use tune::scale::Scale;
 use tune::tuning::{ConcertPitch, Tuning};
@@ -158,7 +158,7 @@ enum ScaleCommand {
     #[structopt(name = "cust")]
     Custom {
         /// Items of the scale
-        items: Vec<Ratio>,
+        items: Vec<RatioExpression>,
 
         /// Name of the scale
         #[structopt(short = "n")]
@@ -481,14 +481,38 @@ fn create_scale(command: ScaleCommand) -> Scale {
     }
 }
 
-fn create_custom_scale(items: Vec<Ratio>, name: String) -> Scale {
+fn create_custom_scale(items: Vec<RatioExpression>, name: String) -> Scale {
     let mut scale = Scale::with_name(name);
     for item in items {
-        scale.push_ratio(item);
+        match item.variant() {
+            RatioExpressionVariant::Float { float_value } => {
+                if let Some(float_value) = as_int(float_value) {
+                    scale.push_fraction(float_value, 1);
+                    continue;
+                }
+            }
+            RatioExpressionVariant::Fraction { numer, denom } => {
+                if let (Some(numer), Some(denom)) = (as_int(numer), as_int(denom)) {
+                    scale.push_fraction(numer, denom);
+                    continue;
+                }
+            }
+            _ => {}
+        }
+        scale.push_ratio(item.ratio());
     }
     scale.build()
 }
 
+fn as_int(float: f64) -> Option<u32> {
+    let rounded = float.round();
+    if (float - rounded).abs() < 1e-6 {
+        Some(rounded as u32)
+    } else {
+        None
+    }
+}
+
 fn create_key_map(key_map_params: KeyMapParams) -> KeyMap {
     KeyMap {
         ref_pitch: key_map_params.ref_pitch,

diff --git a/tune-cli/tests/cli.rs b/tune-cli/tests/cli.rs
@@ -91,9 +91,9 @@ fn crate_custom_scale() {
         "-n",
         "Just intonation",
         "9/8",
-        "5/4",
+        "1.25",
         "4/3",
-        "3/2",
+        "1.5",
         "5/3",
         "15/8",
         "2",

diff --git a/tune-cli/tests/snapshots/scl_cust_-n_Just_intonation_9-8_5-4_4-3_3-2_5-3_15-8_2.stdout b/tune-cli/tests/snapshots/scl_cust_-n_Just_intonation_9-8_5-4_4-3_3-2_5-3_15-8_2.stdout
@@ -1,9 +1,9 @@
 Just intonation
 7
-203.910
+9/8
 386.314
-498.045
+4/3
 701.955
-884.359
-1088.269
-1200.000
+5/3
+15/8
+2/1