Move all "note" code to one note.rs location

README.md

@@ -20,5 +20,3 @@ Under heavy development - Updates forthcoming
   * Take into account `time-only` attributes
   * Scan text attributes for common items (rall., etc.)
   * Scan `sound` attributes for items maybe not recognized otherwise (rall., etc.)
-* Remove `pub(crate)` from Phrase and make `MultiVoice` okay with this
-* Make composition timeslice iterator a real iterator (and check that staff timeslices line up correctly)

amm_sdk/src/note/note.rs

@@ -1,6 +1,7 @@
 use super::{Accidental, Duration, Pitch};
-use crate::context::{generate_id, Key};
+use crate::context::{generate_id, Key, Tempo};
 use crate::modification::{NoteModification, NoteModificationType};
+use crate::temporal::Timeslice;
 use amm_internal::amm_prelude::*;
 use amm_macros::{JsonDeserialize, JsonSerialize};
 #[cfg(target_arch = "wasm32")]
@@ -15,10 +16,26 @@ pub struct Note {
   pub pitch: Pitch,
   pub duration: Duration,
   pub accidental: Accidental,
-  pub(crate) modifications: BTreeSet<NoteModification>,
+  modifications: BTreeSet<NoteModification>,
 }
 
 impl Note {
+  #[must_use]
+  pub fn new(pitch: Pitch, duration: Duration, accidental: Option<Accidental>) -> Self {
+    Self {
+      id: generate_id(),
+      pitch,
+      duration,
+      accidental: accidental.unwrap_or_default(),
+      modifications: BTreeSet::new(),
+    }
+  }
+
+  #[must_use]
+  pub fn get_id(&self) -> usize {
+    self.id
+  }
+
   #[must_use]
   fn semitone_distance(&self, key_accidentals: [Accidental; 8]) -> i8 {
     let (pitch_index, num_semitones) = self.pitch.value();
@@ -69,6 +86,46 @@ impl Note {
       self.duration.beats(base_beat_value)
     }
   }
+
+  pub fn add_modification(&mut self, mod_type: NoteModificationType) -> usize {
+    let modification = NoteModification::new(mod_type);
+    let modification_id = modification.get_id();
+    self.modifications.replace(modification);
+    modification_id
+  }
+
+  #[must_use]
+  pub fn get_modification(&self, id: usize) -> Option<&NoteModification> {
+    self
+      .iter_modifications()
+      .find(|modification| modification.get_id() == id)
+  }
+
+  #[must_use]
+  pub fn get_beats(&self, beat_base: &Duration, tuplet_ratio: Option<f64>) -> f64 {
+    self.beats(beat_base.value()) * tuplet_ratio.unwrap_or(1.0)
+  }
+
+  #[must_use]
+  pub fn get_duration(&self, tempo: &Tempo, tuplet_ratio: Option<f64>) -> f64 {
+    self.get_beats(&tempo.base_note, tuplet_ratio) * 60.0 / f64::from(tempo.beats_per_minute)
+  }
+
+  pub fn remove_modification(&mut self, id: usize) -> &mut Self {
+    self.modifications.retain(|modification| modification.get_id() != id);
+    self
+  }
+
+  pub fn iter_modifications(&self) -> alloc::collections::btree_set::Iter<'_, NoteModification> {
+    self.modifications.iter()
+  }
+
+  #[must_use]
+  pub fn to_timeslice(&self) -> Timeslice {
+    let mut timeslice = Timeslice::new();
+    timeslice.add_note(self.clone());
+    timeslice
+  }
 }
 
 impl PartialEq for Note {

amm_sdk/src/structure/mod.rs

@@ -1,6 +1,5 @@
 mod chord;
 mod multivoice;
-mod note;
 mod part;
 mod phrase;
 mod section;