bugfix with fretboard fretted note calculation

Author: yjpark

apps/notation_kb/assets/fonts/Sofia_Handwritten.otf

@@ -97,29 +97,20 @@ impl ScalePage {
         );
         let mut entries = vec![];
         let duration = Duration::_1_4;
-        let mut add_note = |syllable: &Syllable, semitones: Option<Semitones>| {
-            let octave = if self.scale.calc_do_offset() > 0 {
-                Octave::P3
-            } else {
-                Octave::P4
-            };
-            let note = Note::from(
-                Semitones::from(octave)
-                + Semitones::from(self.key.clone())
-                + Semitones::from(self.scale.calc_syllable_for_sort(syllable))
-                + semitones.unwrap_or(Semitones(0))
-            );
+        let mut add_note = |syllable: &Syllable, add_octave| {
+            let octave = if add_octave { Octave::P5 } else { Octave::P4 };
+            let note = self.scale.calc_note_from_syllable(&self.key, syllable, &octave);
             entries.push(ProtoEntry::from(CoreEntry::from((Tone::from(note), duration))));
         };
         let mut syllables = self.scale.get_syllables();
         for syllable in syllables.iter() {
-            add_note(syllable, None);
+            add_note(syllable, false);
         }
-        add_note(&self.scale.calc_root_syllable(), Some(Semitones(12)));
-        add_note(&self.scale.calc_root_syllable(), Some(Semitones(12)));
+        add_note(&self.scale.calc_root_syllable(), true);
+        add_note(&self.scale.calc_root_syllable(), true);
         syllables.reverse();
         for syllable in syllables.iter() {
-            add_note(syllable, None);
+            add_note(syllable, false);
         }
         let new_bar = |index: usize| {
             ProtoBar::new(

apps/notation_kb/assets/fonts/uchiyama.ttf

@@ -29,7 +29,7 @@ pub struct NotationAssets {
 pub trait ExtraAssets : AssetCollection {
     fn get_assets(&self) -> Vec<HandleUntyped>;
     fn get_syllable_font(_settings: &NotationSettings) -> &'static str {
-        "fonts/uchiyama.ttf"
+        "fonts/Sofia_Handwritten.otf"
     }
     fn get_fret_font(_settings: &NotationSettings) -> &'static str {
         "fonts/Bitter-Bold.ttf"

apps/notation_kb/src/theory/scale.rs

@@ -40,8 +40,15 @@ macro_rules! impl_fretboard {
             pub fn fretted_note(&self, scale: &Scale, key: &Key, string: u8, fret: u8) -> Option<Note> {
                 if fret as usize >= self.fret_num() {
                     None
-                } else {
+                } else if fret == 0 {
                     self.open_note(scale, key, string)
+                } else {
+                    if string == 0 || string as usize > self.string_notes.len() {
+                        None
+                    } else {
+                        let semitones = self.string_notes[(string - 1) as usize];
+                        Some(self.get_capo_note(scale, key, semitones + Semitones(fret as i8)))
+                    }
                 }
             }
             pub fn string_num(&self) -> usize {

apps/notation_viewer/assets/fonts/Sofia_Handwritten.otf

@@ -0,0 +1 @@
+https://www.dafont.com/sofia-handwritten.font