wip

yjpark · yjpark · commit 3f4af053af16 · 2022-01-11T17:20:29.000+08:00
diff --git a/apps/notation_kb/src/theory/scale.rs b/apps/notation_kb/src/theory/scale.rs
@@ -30,17 +30,6 @@ impl KbPage for ScalePage {
         let scale = self.scale.clone();
         let key = self.key.clone();
         ui.horizontal(|ui| {
-            ui.label("Key:");
-            egui::ComboBox::from_id_source("key")
-            .width(64.0)
-            .selected_text(key.to_string())
-            .show_ui(ui, |ui| {
-                for k in notation_bevy::prelude::Key::ALL.iter() {
-                    if ui.selectable_label(*k == key, k.to_string()).clicked() {
-                        self.key = k.clone();
-                    }
-                }
-            });
             ui.label("Scale:");
             egui::ComboBox::from_id_source("scale")
             .width(128.0)
@@ -52,6 +41,17 @@ impl KbPage for ScalePage {
                     }
                 }
             });
+            ui.label("Key:");
+            egui::ComboBox::from_id_source("key")
+            .width(64.0)
+            .selected_text(key.to_string())
+            .show_ui(ui, |ui| {
+                for k in scale.get_keys().iter() {
+                    if ui.selectable_label(*k == key, k.to_string()).clicked() {
+                        self.key = k.clone();
+                    }
+                }
+            });
         });
         ui.separator();
         NotesPage::notes_ui(ui, texts, assets, state, theme, link_evts, self.scale, self.key, self.transpose);
diff --git a/crates/notation_bevy/src/kb/chords_page.rs b/crates/notation_bevy/src/kb/chords_page.rs
@@ -43,7 +43,7 @@ impl KbPage for ChordsPage {
             .as_ref()
             .map(|x| x.meta.key.clone())
             .unwrap_or_default();
-        PageHelper::add_key_scale(ui, &key, &scale);
+        PageHelper::add_scale_key(ui, &scale, &key);
         ui.separator();
         egui::Grid::new("chords").show(ui, |ui| {
             for chord in chords.iter() {
diff --git a/crates/notation_bevy/src/kb/notes_page.rs b/crates/notation_bevy/src/kb/notes_page.rs
@@ -33,7 +33,7 @@ impl KbPage for NotesPage {
             .as_ref()
             .map(|x| x.meta.key.clone())
             .unwrap_or_default();
-        PageHelper::add_key_scale(ui, &key, &scale);
+        PageHelper::add_scale_key(ui, &scale, &key);
         ui.separator();
 
         let capo = state.tab.as_ref().and_then(|tab| {
diff --git a/crates/notation_bevy/src/kb/page_helper.rs b/crates/notation_bevy/src/kb/page_helper.rs
@@ -24,12 +24,12 @@ impl PageHelper {
             ui.label(text);
         }
     }
-    pub fn add_key_scale(ui: &mut Ui, key: &Key, scale: &Scale) {
+    pub fn add_scale_key(ui: &mut Ui, scale: &Scale, key: &Key) {
         ui.horizontal(|ui| {
-            ui.label("Key:");
-            Self::add_strong_text(ui, &key.to_string());
             ui.label("Scale:");
             Self::add_strong_text(ui, &scale.to_string());
+            ui.label("Key:");
+            Self::add_strong_text(ui, &key.to_string());
         });
     }
     pub fn add_syllable_color(ui: &mut Ui, theme: &NotationTheme, syllable: &Syllable) {
diff --git a/crates/notation_core/src/key.rs b/crates/notation_core/src/key.rs
@@ -32,6 +32,7 @@ impl Key {
 
     pub const C_SHARP: Self = Self::Sharp(PitchName::C);
     pub const D_SHARP: Self = Self::Sharp(PitchName::D);
+    pub const E_SHARP: Self = Self::Sharp(PitchName::E);
     pub const F_SHARP: Self = Self::Sharp(PitchName::F);
     pub const G_SHARP: Self = Self::Sharp(PitchName::G);
     pub const A_SHARP: Self = Self::Sharp(PitchName::A);
@@ -42,10 +43,10 @@ impl Key {
     pub const A_FLAT: Self = Self::Flat(PitchName::A);
     pub const B_FLAT: Self = Self::Flat(PitchName::B);
 
-    pub const ALL: [Key ; 17] = [
+    pub const ALL: [Key ; 18] = [
         Key::C, Key::C_SHARP, Key::D_FLAT,
         Key::D, Key::D_SHARP, Key::E_FLAT,
-        Key::E,
+        Key::E, Key::E_SHARP,
         Key::F, Key::F_SHARP, Key::G_FLAT,
         Key::G, Key::G_SHARP, Key::A_FLAT,
         Key::A, Key::A_SHARP, Key::B_FLAT,
@@ -72,6 +73,7 @@ impl Key {
             "B" => Self::B,
             "#C" => Self::C_SHARP,
             "#D" => Self::D_SHARP,
+            "#E" => Self::E_SHARP,
             "#F" => Self::F_SHARP,
             "#G" => Self::G_SHARP,
             "#A" => Self::A_SHARP,
@@ -104,6 +106,7 @@ impl Key {
             "B" => Self::B,
             "C_SHARP" => Self::C_SHARP,
             "D_SHARP" => Self::D_SHARP,
+            "E_SHARP" => Self::E_SHARP,
             "F_SHARP" => Self::F_SHARP,
             "G_SHARP" => Self::G_SHARP,
             "A_SHARP" => Self::A_SHARP,
diff --git a/crates/notation_core/src/scale.rs b/crates/notation_core/src/scale.rs
@@ -118,6 +118,109 @@ impl Scale {
             ],
         }
     }
+    //https://www.hooktheory.com/cheat-sheet
+    pub fn get_keys(&self) -> Vec<Key> {
+        match self {
+            Scale::Ionian => vec![
+                Key::C,
+                Key::D_FLAT,
+                Key::D,
+                Key::E_FLAT,
+                Key::E,
+                Key::F,
+                Key::F_SHARP,
+                Key::G,
+                Key::A_FLAT,
+                Key::A,
+                Key::B_FLAT,
+                Key::B,
+            ],
+            Scale::Dorian => vec![
+                Key::D,
+                Key::E_FLAT,
+                Key::E,
+                Key::F,
+                Key::F_SHARP,
+                Key::G,
+                Key::G_SHARP,
+                Key::A,
+                Key::B_FLAT,
+                Key::B,
+                Key::C,
+                Key::C_SHARP,
+            ],
+            Scale::Phrygian => vec![
+                Key::E,
+                Key::F,
+                Key::F_SHARP,
+                Key::G,
+                Key::G_SHARP,
+                Key::A,
+                Key::A_SHARP,
+                Key::B,
+                Key::C,
+                Key::C_SHARP,
+                Key::D,
+                Key::D_SHARP,
+            ],
+            Scale::Lydian => vec![
+                Key::F,
+                Key::G_FLAT,
+                Key::G,
+                Key::A_FLAT,
+                Key::A,
+                Key::B_FLAT,
+                Key::B,
+                Key::C,
+                Key::D_FLAT,
+                Key::D,
+                Key::E_FLAT,
+                Key::E,
+            ],
+            Scale::Mixolydian => vec![
+                Key::G,
+                Key::A_FLAT,
+                Key::A,
+                Key::B_FLAT,
+                Key::B,
+                Key::C,
+                Key::C_SHARP,
+                Key::D,
+                Key::E_FLAT,
+                Key::E,
+                Key::F,
+                Key::F_SHARP,
+            ],
+            Scale::Aeolian => vec![
+                Key::A,
+                Key::B_FLAT,
+                Key::B,
+                Key::C,
+                Key::C_SHARP,
+                Key::D,
+                Key::D_SHARP,
+                Key::E,
+                Key::F,
+                Key::F_SHARP,
+                Key::G,
+                Key::G_SHARP,
+            ],
+            Scale::Locrian => vec![
+                Key::B,
+                Key::C,
+                Key::C_SHARP,
+                Key::D,
+                Key::D_SHARP,
+                Key::E,
+                Key::E_SHARP,
+                Key::F_SHARP,
+                Key::G,
+                Key::G_SHARP,
+                Key::A,
+                Key::A_SHARP,
+            ],
+        }
+    }
 }
 
 impl Scale {

Original file line number	Diff line number	Diff line change
`@@ -24,12 +24,12 @@ impl PageHelper {`
`24`	`24`	`ui.label(text);`
`25`	`25`	`}`
`26`	`26`	`}`
`27`		`- pub fn add_key_scale(ui: &mut Ui, key: &Key, scale: &Scale) {`
	`27`	`+ pub fn add_scale_key(ui: &mut Ui, scale: &Scale, key: &Key) {`
`28`	`28`	`ui.horizontal(\|ui\| {`
`29`		`- ui.label("Key:");`
`30`		`- Self::add_strong_text(ui, &key.to_string());`
`31`	`29`	`ui.label("Scale:");`
`32`	`30`	`Self::add_strong_text(ui, &scale.to_string());`
	`31`	`+ ui.label("Key:");`
	`32`	`+ Self::add_strong_text(ui, &key.to_string());`
`33`	`33`	`});`
`34`	`34`	`}`
`35`	`35`	`pub fn add_syllable_color(ui: &mut Ui, theme: &NotationTheme, syllable: &Syllable) {`