issue #26 Notes change wrong on scale change

mebitek · Jan 9, 2024 · 0667e9c · 0667e9c
1 parent 1abf0c1
commit 0667e9c
Show file tree

Hide file tree

Showing 10 changed files with 192 additions and 16 deletions.
diff --git a/src/apps/sequencer/model/NoteSequence.h b/src/apps/sequencer/model/NoteSequence.h
@@ -13,9 +13,11 @@
 
 #include <array>
 #include <bitset>
+#include <cstddef>
 #include <cstdint>
 #include <initializer_list>
 #include <iostream>
+#include <map>
 
 class NoteSequence {
 public:
@@ -271,8 +273,39 @@ class NoteSequence {
     // scale
 
     int scale() const { return _scale.get(isRouted(Routing::Target::Scale)); }
-    void setScale(int scale, bool routed = false) {
-        _scale.set(clamp(scale, -1, Scale::Count - 1), routed);
+    void setScale(int s, bool routed = false) {
+
+        int pScaleIndex = scale();
+        auto &pScale = selectedScale(scale());
+
+        _scale.set(clamp(s, -1, Scale::Count - 1), routed);
+
+        auto &aScale = selectedScale(s);
+
+        if (s != -1 && pScaleIndex != -1 && aScale.isChromatic() && aScale.Count > 0) {
+            for (int i = 0; i < 64; ++i) {
+
+                auto pStep = _steps[i];
+
+                int rN = pScale.noteIndex(pStep.note(), selectedRootNote(0));
+                if (rN > 0) {
+                    if (aScale.isNotePresent(rN)) {
+                        int pNoteIndex = aScale.getNoteIndex(rN);
+                        step(i).setNote(pNoteIndex);
+                    } else {
+                        // search nearest note
+                        while (!aScale.isNotePresent(rN)) {
+                            rN--;
+                        }
+                        int pNoteIndex = aScale.getNoteIndex(rN);
+                        step(i).setNote(pNoteIndex);
+                    }
+                }
+
+
+            }
+        }
+
     }
 
     int indexedScale() const { return scale() + 1; }
@@ -282,7 +315,7 @@ class NoteSequence {
 
     void editScale(int value, bool shift) {
         if (!isRouted(Routing::Target::Scale)) {
-            setScale(scale() + value);
+            setScale(value);
         }
     }
 
@@ -473,6 +506,10 @@ class NoteSequence {
     void write(VersionedSerializedWriter &writer) const;
     void read(VersionedSerializedReader &reader);
 
+    int trackIndex() {
+        return _trackIndex;
+    }
+
 private:
     void setTrackIndex(int trackIndex) { _trackIndex = trackIndex; }
 
@@ -489,6 +526,9 @@ class NoteSequence {
 
     int8_t _trackIndex = -1;
     Routable<int8_t> _scale;
+
+    int _previousScale;
+
     Routable<int8_t> _rootNote;
     Routable<uint16_t> _divisor;
     uint8_t _resetMeasure;

diff --git a/src/apps/sequencer/model/Project.h b/src/apps/sequencer/model/Project.h
@@ -2,6 +2,7 @@
 
 #include "Config.h"
 #include "Observable.h"
+#include "Scale.h"
 #include "Types.h"
 #include "TimeSignature.h"
 #include "ClockSetup.h"
@@ -133,12 +134,54 @@ class Project {
     // scale
 
     int scale() const { return _scale; }
-    void setScale(int scale) {
-        _scale = clamp(scale, 0, Scale::Count - 1);
+    void setScale(int s) {
+        int pScaleIndex = scale();
+        auto &pScale = Scale::get(scale());
+
+        _scale = clamp(s, 0, Scale::Count - 1);
+
+        auto &aScale = Scale::get(s);
+
+        if (s != -1 && pScaleIndex != -1 && aScale.isChromatic()) {
+
+            for (int trackIndex = 0; trackIndex < 8; ++trackIndex) {    
+                    auto &t = track(trackIndex);
+                    switch (t.trackMode()) {
+                        case Track::TrackMode::Note: {
+                            for (auto &seq : t.noteTrack().sequences()) {
+                                if (seq.scale()==-1) {
+                                    for (int i = 0; i < 64; ++i) {
+                                        auto pStep = seq.step(i);
+
+                                        int rN = pScale.noteIndex(pStep.note(), rootNote());
+                                        if (rN > 0) {
+                                            if (aScale.isNotePresent(rN)) {
+                                                int pNoteIndex = aScale.getNoteIndex(rN);
+                                                seq.step(i).setNote(pNoteIndex);
+                                            } else {
+                                                // search nearest note
+                                                while (!aScale.isNotePresent(rN)) {
+                                                    rN--;
+                                                }
+                                                int pNoteIndex = aScale.getNoteIndex(rN);
+                                                seq.step(i).setNote(pNoteIndex);
+                                            }
+                                        }
+                                    }
+                                }
+                            }
+                            break;
+                        }
+                        default:
+                            break;
+                    }                    
+                }
+        }
+
     }
 
     void editScale(int value, bool shift) {
-        setScale(scale() + value);
+        setScale(value);
     }
 
     void printScale(StringBuilder &str) const {

diff --git a/src/apps/sequencer/model/Scale.h b/src/apps/sequencer/model/Scale.h
@@ -25,6 +25,7 @@ class Scale {
     virtual bool isChromatic() const = 0;
     virtual bool isNotePresent(int note) const = 0;
     virtual int getNoteIndex(int note) const = 0;
+    virtual int noteIndex(int note, int rootNote) const = 0;
 
     virtual void noteName(StringBuilder &str, int note, int rootNote, Format format = Long) const = 0;
     virtual float noteToVolts(int note) const = 0;
@@ -111,6 +112,21 @@ class NoteScale : public Scale {
         }
     }
 
+    int noteIndex(int note, int rootNote) const override {
+        int octave = roundDownDivide(note, _noteCount);
+        int noteIndex = 0;
+        if (isChromatic()) {
+            noteIndex = _notes[note - octave * _noteCount] / 128 + rootNote;
+            while (noteIndex >= 12) {
+                noteIndex -= 12;
+                octave += 1;
+            }
+        } else {
+            noteIndex = note - octave * _noteCount + 1;
+        }
+        return noteIndex;
+    }
+
     float noteToVolts(int note) const override {
         int octave = roundDownDivide(note, _noteCount);
         int index = note - octave * _noteCount;
@@ -168,6 +184,10 @@ class VoltScale : public Scale {
         return -1;
     }
 
+    int noteIndex(int note, int rootNote) const override {
+        return -1;
+    }
+
     void noteName(StringBuilder &str, int note, int rootNote, Format format) const override {
         switch (format) {
         case Short1:

diff --git a/src/apps/sequencer/model/Types.h b/src/apps/sequencer/model/Types.h
@@ -309,6 +309,8 @@ class Types {
         str(names[note]);
     }
 
+
+
     static void printMidiNote(StringBuilder &str, int midiNote) {
         printNote(str, midiNote % 12);
         int octave = midiNote / 12 - 1;

diff --git a/src/apps/sequencer/model/UserScale.h b/src/apps/sequencer/model/UserScale.h
@@ -175,6 +175,18 @@ class UserScale : public Scale {
         return -1;
     }
 
+    int noteIndex(int note, int rootNote) const override {
+        int octave = roundDownDivide(note, _size);
+
+        int noteIndex = _items[note - octave * _size] + rootNote;
+        while (noteIndex >= 12) {
+            noteIndex -= 12;
+            octave += 1;
+        }
+
+       return noteIndex;
+    }
+
     void noteName(StringBuilder &str, int note, int rootNote, Format format) const override {
         switch (_mode) {
         case Mode::Chromatic:

diff --git a/src/apps/sequencer/ui/model/NoteSequenceListModel.h b/src/apps/sequencer/ui/model/NoteSequenceListModel.h
@@ -6,6 +6,7 @@
 
 #include "model/NoteSequence.h"
 #include "model/Scale.h"
+#include <iostream>
 
 class NoteSequenceListModel : public RoutableListModel {
 public:
@@ -21,7 +22,16 @@ class NoteSequenceListModel : public RoutableListModel {
     };
 
     NoteSequenceListModel()
-    {}
+    {
+        _scales[0] = -1;
+        for (int i = 1; i < 23; ++i) {
+            _scales[i] = i-1;
+        }
+
+        for (int i = 0; i < 8; ++i) {
+            _selectedScale[i] = 0;
+        }
+    }
 
     void setSequence(NoteSequence *sequence) {
         _sequence = sequence;
@@ -82,6 +92,13 @@ class NoteSequenceListModel : public RoutableListModel {
         }
     }
 
+    void setSelectedScale() {
+        if (_editScale) {
+            _sequence->editScale(_scales[_selectedScale[_sequence->trackIndex()]], false);
+        }
+        _editScale = !_editScale;
+    }
+
 private:
     static const char *itemName(Item item) {
         switch (item) {
@@ -118,8 +135,11 @@ class NoteSequenceListModel : public RoutableListModel {
         case ResetMeasure:
             _sequence->printResetMeasure(str);
             break;
-        case Scale:
-            _sequence->printScale(str);
+        case Scale: {
+                int trackIndex = _sequence->trackIndex();
+                auto name = _scales[_selectedScale[trackIndex]] < 0 ? "Default" : Scale::name(_scales[_selectedScale[trackIndex]]);
+                str(name);
+            }
             break;
         case RootNote:
             _sequence->printRootNote(str);
@@ -146,8 +166,10 @@ class NoteSequenceListModel : public RoutableListModel {
         case ResetMeasure:
             _sequence->editResetMeasure(value, shift);
             break;
-        case Scale:
-            _sequence->editScale(value, shift);
+        case Scale: {
+            int trackIndex = _sequence->trackIndex();
+            _selectedScale[trackIndex] = clamp(_selectedScale[trackIndex] + value, 0, 23);
+            }
             break;
         case RootNote:
             _sequence->editRootNote(value, shift);
@@ -221,4 +243,8 @@ class NoteSequenceListModel : public RoutableListModel {
     }
 
     NoteSequence *_sequence;
+    private:
+        std::array<int, 23> _scales;
+        std::array<int, 8> _selectedScale;
+        bool _editScale = false;
 };
diff --git a/src/apps/sequencer/ui/model/ProjectListModel.h b/src/apps/sequencer/ui/model/ProjectListModel.h
@@ -5,12 +5,17 @@
 #include "RoutableListModel.h"
 
 #include "model/Project.h"
+#include <iostream>
 
 class ProjectListModel : public RoutableListModel {
 public:
     ProjectListModel(Project &project) :
         _project(project)
-    {}
+    {
+        for (int i = 0; i < 23; ++i) {
+            _scales[i] = i;
+        }
+    }
 
     virtual int rows() const override {
         return Last;
@@ -45,6 +50,13 @@ class ProjectListModel : public RoutableListModel {
         }
     }
 
+    void setSelectedScale() {
+        if (_editScale) {
+            _project.editScale(_scales[_selectedScale], false);
+        }
+        _editScale = !_editScale;
+    }
+
 private:
     enum Item {
         Name,
@@ -104,8 +116,10 @@ class ProjectListModel : public RoutableListModel {
         case SyncMeasure:
             _project.printSyncMeasure(str);
             break;
-        case Scale:
-            _project.printScale(str);
+        case Scale: {
+            auto name = _scales[_selectedScale] < 0 ? "Default" : Scale::name(_scales[_selectedScale]);
+            str(name);
+            }
             break;
         case RootNote:
             _project.printRootNote(str);
@@ -150,7 +164,7 @@ class ProjectListModel : public RoutableListModel {
             _project.editSyncMeasure(value, shift);
             break;
         case Scale:
-            _project.editScale(value, shift);
+            _selectedScale = clamp(_selectedScale + value, 0, 23);
             break;
         case RootNote:
             _project.editRootNote(value, shift);
@@ -179,4 +193,8 @@ class ProjectListModel : public RoutableListModel {
     }
 
     Project &_project;
+    private:
+        std::array<int, 23> _scales;
+        int _selectedScale = 0;
+        bool _editScale = false;
 };
diff --git a/src/apps/sequencer/ui/pages/ListPage.h b/src/apps/sequencer/ui/pages/ListPage.h
@@ -21,7 +21,7 @@ class ListPage : public BasePage {
     virtual void keyPress(KeyPressEvent &event) override;
     virtual void encoder(EncoderEvent &event) override;
 
-    int selectedRow() const { return _selectedRow; }
+    virtual int selectedRow() const { return _selectedRow; }
     void setSelectedRow(int selectedRow);
 
     bool edit() const { return _edit; }

diff --git a/src/apps/sequencer/ui/pages/NoteSequencePage.cpp b/src/apps/sequencer/ui/pages/NoteSequencePage.cpp
@@ -1,11 +1,13 @@
 #include "NoteSequencePage.h"
 
+#include "ListPage.h"
 #include "Pages.h"
 
 #include "ui/LedPainter.h"
 #include "ui/painters/WindowPainter.h"
 
 #include "core/utils/StringBuilder.h"
+#include <iostream>
 
 enum class ContextAction {
     Init,
@@ -66,6 +68,12 @@ void NoteSequencePage::keyPress(KeyPressEvent &event) {
     if (!event.consumed()) {
         ListPage::keyPress(event);
     }
+    if (key.isEncoder()) {
+        auto row = ListPage::selectedRow();
+        if (row == 5) {
+            _listModel.setSelectedScale();
+        }
+    }
 }
 
 void NoteSequencePage::contextShow() {