Add percentage interpolation to velocity dialog

juzzlin · juzzlin · commit 72e077293323 · 2025-11-13T21:27:20.000+02:00
- Refactors InterpolationDialog.qml to optionally accept percentage values for velocity interpolation.
diff --git a/CHANGELOG b/CHANGELOG
@@ -5,6 +5,8 @@ Release date:
 
 New features:
 
+* Add percentage interpolation to velocity dialog
+
 Bug fixes:
 
 Other:
diff --git a/src/application/service/editor_service.cpp b/src/application/service/editor_service.cpp
@@ -1238,39 +1238,39 @@ void EditorService::requestSelectionTranspose(int semitones)
     }
 }
 
-void EditorService::requestLinearVelocityInterpolationOnColumn(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue)
+void EditorService::requestLinearVelocityInterpolationOnColumn(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue, bool usePercentages)
 {
     auto start = position();
     start.line = startLine;
 
     auto end = position();
     end.line = endLine;
 
-    if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnColumn(m_song, start, end, startValue, endValue); !changedPositions.empty()) {
+    if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnColumn(m_song, start, end, startValue, endValue, usePercentages); !changedPositions.empty()) {
         for (auto && position : changedPositions) {
             emit noteDataAtPositionChanged(position);
         }
         setIsModified(true);
     }
 }
 
-void EditorService::requestLinearVelocityInterpolationOnTrack(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue)
+void EditorService::requestLinearVelocityInterpolationOnTrack(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue, bool usePercentages)
 {
     auto start = position();
     start.line = startLine;
 
     auto end = position();
     end.line = endLine;
 
-    if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnTrack(m_song, start, end, startValue, endValue); !changedPositions.empty()) {
+    if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnTrack(m_song, start, end, startValue, endValue, usePercentages); !changedPositions.empty()) {
         for (auto && position : changedPositions) {
             emit noteDataAtPositionChanged(position);
         }
         setIsModified(true);
     }
 }
 
-void EditorService::requestLinearVelocityInterpolationOnSelection(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue)
+void EditorService::requestLinearVelocityInterpolationOnSelection(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue, bool usePercentages)
 {
     if (m_selectionService->isValidSelection()) {
         for (auto column = m_selectionService->minColumn(); column <= m_selectionService->maxColumn(); column++) {
@@ -1283,7 +1283,7 @@ void EditorService::requestLinearVelocityInterpolationOnSelection(quint64 startL
             end.column = column;
             end.line = endLine;
 
-            if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnColumn(m_song, start, end, startValue, endValue); !changedPositions.empty()) {
+            if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnColumn(m_song, start, end, startValue, endValue, usePercentages); !changedPositions.empty()) {
                 for (auto && position : changedPositions) {
                     emit noteDataAtPositionChanged(position);
                 }
diff --git a/src/application/service/editor_service.hpp b/src/application/service/editor_service.hpp
@@ -191,11 +191,11 @@ class EditorService : public QObject
     Q_INVOKABLE void requestSelectionTranspose(int semitones);
 
     //! Performs linear interpolation on velocity on current column over given lines.
-    Q_INVOKABLE void requestLinearVelocityInterpolationOnColumn(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue);
+    Q_INVOKABLE void requestLinearVelocityInterpolationOnColumn(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue, bool usePercentages);
     //! Performs linear interpolation on velocity on current column over given lines.
-    Q_INVOKABLE void requestLinearVelocityInterpolationOnTrack(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue);
+    Q_INVOKABLE void requestLinearVelocityInterpolationOnTrack(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue, bool usePercentages);
     //! Performs linear interpolation on velocity on currently selected columns.
-    Q_INVOKABLE void requestLinearVelocityInterpolationOnSelection(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue);
+    Q_INVOKABLE void requestLinearVelocityInterpolationOnSelection(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue, bool usePercentages);
 
     Q_INVOKABLE void setDelayOnCurrentLine(quint8 ticks);
     Q_INVOKABLE quint8 delayAtCurrentPosition() const;
diff --git a/src/domain/note_data_manipulator.cpp b/src/domain/note_data_manipulator.cpp
@@ -25,27 +25,34 @@ namespace noteahead {
 
 static const auto TAG = "NoteDataManipulator";
 
-NoteDataManipulator::ChangedPositions NoteDataManipulator::interpolateVelocityOnColumn(SongW song, const Position & start, const Position & end, uint8_t startValue, uint8_t endValue)
+NoteDataManipulator::ChangedPositions NoteDataManipulator::interpolateVelocityOnColumn(SongW song, const Position & start, const Position & end, uint8_t startValue, uint8_t endValue, bool usePercentages)
 {
-    juzzlin::L(TAG).info() << "Requesting linear velocity interpolation on a column: " << start.toString() << " -> " << end.toString() << ", " << static_cast<int>(startValue) << " -> " << static_cast<int>(endValue);
+    juzzlin::L(TAG).info() << "Requesting linear velocity interpolation on a column: " << start.toString() << " -> " << end.toString() << ", " << static_cast<int>(startValue) << " -> " << static_cast<int>(endValue) << ", usePercentages=" << usePercentages;
     NoteDataManipulator::ChangedPositions changedPositions;
     if (const auto locked = song.lock(); locked) {
         const Interpolator interpolator { start.line, end.line, static_cast<double>(startValue), static_cast<double>(endValue) };
         for (auto line = start.line; line <= end.line; line++) {
             auto targetPosition = start;
             targetPosition.line = line;
             if (const auto noteData = locked->noteDataAtPosition(targetPosition); noteData && noteData->type() == NoteData::Type::NoteOn) {
-                noteData->setVelocity(static_cast<uint8_t>(interpolator.getValue(targetPosition.line)));
+                if (usePercentages) {
+                    const double currentVelocity = static_cast<double>(noteData->velocity());
+                    const double percentage = interpolator.getValue(targetPosition.line); // This is 0-100
+                    const uint8_t newVelocity = static_cast<uint8_t>(std::clamp(currentVelocity * (percentage / 100.0), 0.0, 127.0));
+                    noteData->setVelocity(newVelocity);
+                } else {
+                    noteData->setVelocity(static_cast<uint8_t>(interpolator.getValue(targetPosition.line)));
+                }
                 changedPositions.push_back(targetPosition);
             }
         }
     }
     return changedPositions;
 }
 
-NoteDataManipulator::ChangedPositions NoteDataManipulator::interpolateVelocityOnTrack(SongW song, const Position & start, const Position & end, uint8_t startValue, uint8_t endValue)
+NoteDataManipulator::ChangedPositions NoteDataManipulator::interpolateVelocityOnTrack(SongW song, const Position & start, const Position & end, uint8_t startValue, uint8_t endValue, bool usePercentages)
 {
-    juzzlin::L(TAG).info() << "Requesting linear velocity interpolation on a track: " << start.toString() << " -> " << end.toString() << ", " << static_cast<int>(startValue) << " -> " << static_cast<int>(endValue);
+    juzzlin::L(TAG).info() << "Requesting linear velocity interpolation on a track: " << start.toString() << " -> " << end.toString() << ", " << static_cast<int>(startValue) << " -> " << static_cast<int>(endValue) << ", usePercentages=" << usePercentages;
     NoteDataManipulator::ChangedPositions changedPositions;
     if (const auto locked = song.lock(); locked) {
         const Interpolator interpolator { start.line, end.line, static_cast<double>(startValue), static_cast<double>(endValue) };
@@ -55,7 +62,14 @@ NoteDataManipulator::ChangedPositions NoteDataManipulator::interpolateVelocityOn
                 targetPosition.column = column;
                 targetPosition.line = line;
                 if (const auto noteData = locked->noteDataAtPosition(targetPosition); noteData && noteData->type() == NoteData::Type::NoteOn) {
-                    noteData->setVelocity(static_cast<uint8_t>(interpolator.getValue(targetPosition.line)));
+                    if (usePercentages) {
+                        const double currentVelocity = static_cast<double>(noteData->velocity());
+                        const double percentage = interpolator.getValue(targetPosition.line); // This is 0-100
+                        const uint8_t newVelocity = static_cast<uint8_t>(std::clamp(currentVelocity * (percentage / 100.0), 0.0, 127.0));
+                        noteData->setVelocity(newVelocity);
+                    } else {
+                        noteData->setVelocity(static_cast<uint8_t>(interpolator.getValue(targetPosition.line)));
+                    }
                     changedPositions.push_back(targetPosition);
                 }
             }
diff --git a/src/domain/note_data_manipulator.hpp b/src/domain/note_data_manipulator.hpp
@@ -28,8 +28,8 @@ namespace NoteDataManipulator {
 
 using SongW = std::weak_ptr<Song>;
 using ChangedPositions = std::vector<Position>;
-ChangedPositions interpolateVelocityOnColumn(SongW song, const Position & start, const Position & end, uint8_t startValue, uint8_t endValue);
-ChangedPositions interpolateVelocityOnTrack(SongW song, const Position & start, const Position & end, uint8_t startValue, uint8_t endValue);
+ChangedPositions interpolateVelocityOnColumn(SongW song, const Position & start, const Position & end, uint8_t startValue, uint8_t endValue, bool usePercentages);
+ChangedPositions interpolateVelocityOnTrack(SongW song, const Position & start, const Position & end, uint8_t startValue, uint8_t endValue, bool usePercentages);
 
 } // namespace NoteDataManipulator
 } // namespace noteahead
diff --git a/src/unit_tests/editor_service_test/editor_service_test.cpp b/src/unit_tests/editor_service_test/editor_service_test.cpp
@@ -933,7 +933,7 @@ void EditorServiceTest::test_requestLinearVelocityInterpolationOnColumn_shouldIn
     QVERIFY(editorService.requestPosition(0, 0, 0, 7, 0));
     QVERIFY(editorService.requestNoteOnAtCurrentPosition(1, 3, 64));
 
-    editorService.requestLinearVelocityInterpolationOnColumn(0, 7, 0, 100);
+    editorService.requestLinearVelocityInterpolationOnColumn(0, 7, 0, 100, false);
 
     QCOMPARE(noteDataChangedSpy.count(), 6);
     QCOMPARE(editorService.displayNoteAtPosition(0, 0, 0, 0), "C-3");
@@ -965,7 +965,7 @@ void EditorServiceTest::test_requestLinearVelocityInterpolationOnTrack_shouldInt
     QVERIFY(editorService.requestPosition(0, 0, 1, 7, 0));
     QVERIFY(editorService.requestNoteOnAtCurrentPosition(1, 3, 64));
 
-    editorService.requestLinearVelocityInterpolationOnTrack(0, 7, 0, 100);
+    editorService.requestLinearVelocityInterpolationOnTrack(0, 7, 0, 100, false);
 
     QCOMPARE(noteDataChangedSpy.count(), 12);
 
@@ -984,6 +984,34 @@ void EditorServiceTest::test_requestLinearVelocityInterpolationOnTrack_shouldInt
     QCOMPARE(editorService.displayVelocityAtPosition(0, 0, 1, 7), "100");
 }
 
+void EditorServiceTest::test_requestLinearVelocityInterpolationOnColumn_shouldInterpolateVelocitiesAsPercentages()
+{
+    EditorService editorService;
+    QSignalSpy noteDataChangedSpy { &editorService, &EditorService::noteDataAtPositionChanged };
+
+    QVERIFY(editorService.requestPosition(0, 0, 0, 0, 0));
+    QVERIFY(editorService.requestNoteOnAtCurrentPosition(1, 3, 100)); // Initial velocity 100
+    QVERIFY(editorService.requestPosition(0, 0, 0, 3, 0));
+    QVERIFY(editorService.requestNoteOnAtCurrentPosition(1, 3, 50));  // Initial velocity 50
+    QVERIFY(editorService.requestPosition(0, 0, 0, 7, 0));
+    QVERIFY(editorService.requestNoteOnAtCurrentPosition(1, 3, 20));  // Initial velocity 20
+
+    // Interpolate from 50% to 150%
+    editorService.requestLinearVelocityInterpolationOnColumn(0, 7, 50, 150, true);
+
+    QCOMPARE(noteDataChangedSpy.count(), 6);
+    QCOMPARE(editorService.displayNoteAtPosition(0, 0, 0, 0), "C-3");
+    // Line 0: 100 * 0.50 = 50
+    QCOMPARE(editorService.displayVelocityAtPosition(0, 0, 0, 0), "050");
+    QCOMPARE(editorService.displayNoteAtPosition(0, 0, 0, 3), "C-3");
+    // Line 3: Interpolated percentage at line 3: 50 + (150 - 50) * (3.0 / 7.0) = 50 + 100 * 0.42857 = 50 + 42.857 = 92.857
+    //         Velocity at line 3: 50 * 92.857 / 100 = 46.4285 -> 46
+    QCOMPARE(editorService.displayVelocityAtPosition(0, 0, 0, 3), "046");
+    QCOMPARE(editorService.displayNoteAtPosition(0, 0, 0, 7), "C-3");
+    // Line 7: 20 * 1.50 = 30
+    QCOMPARE(editorService.displayVelocityAtPosition(0, 0, 0, 7), "030");
+}
+
 void EditorServiceTest::test_requestPosition_invalidPosition_shouldNotChangePosition()
 {
     EditorService editorService;
diff --git a/src/unit_tests/editor_service_test/editor_service_test.hpp b/src/unit_tests/editor_service_test/editor_service_test.hpp
@@ -79,6 +79,7 @@ private slots:
 
     void test_requestLinearVelocityInterpolationOnColumn_shouldInterpolateVelocities();
     void test_requestLinearVelocityInterpolationOnTrack_shouldInterpolateVelocities();
+    void test_requestLinearVelocityInterpolationOnColumn_shouldInterpolateVelocitiesAsPercentages();
 
     void test_requestPosition_invalidPosition_shouldNotChangePosition();
     void test_requestPosition_validPosition_shouldChangePosition();
diff --git a/src/view/qml/Dialogs/InterpolationDialog.qml b/src/view/qml/Dialogs/InterpolationDialog.qml
@@ -8,6 +8,9 @@ Dialog {
     id: rootItem
     modal: true
     standardButtons: Dialog.Ok | Dialog.Cancel
+    function usePercentages() {
+        return percentageCheckBox.checked;
+    }
     function setTitle(text) {
         title = "<strong>" + text + "</strong>";
     }
@@ -38,10 +41,31 @@ Dialog {
     contentItem: GridLayout {
         rowSpacing: 10
         width: parent.width
+        CheckBox {
+            id: percentageCheckBox
+            text: qsTr("Use percentages")
+            Layout.columnSpan: 4
+            Layout.row: 0
+            onCheckedChanged: {
+                if (checked) {
+                    startValueSpinBox.from = 0;
+                    startValueSpinBox.to = 200;
+                    endValueSpinBox.from = 0;
+                    endValueSpinBox.to = 200;
+                    if (startValueSpinBox.value > 200) startValueSpinBox.value = 200;
+                    if (endValueSpinBox.value > 200) endValueSpinBox.value = 200;
+                } else {
+                    startValueSpinBox.from = 0;
+                    startValueSpinBox.to = 127;
+                    endValueSpinBox.from = 0;
+                    endValueSpinBox.to = 127;
+                }
+            }
+        }
         Label {
             text: qsTr("Start value:")
             Layout.column: 0
-            Layout.row: 0
+            Layout.row: 1
         }
         SpinBox {
             id: startValueSpinBox
@@ -54,13 +78,13 @@ Dialog {
                 focus = false;
             }
             Layout.column: 1
-            Layout.row: 0
+            Layout.row: 1
             Layout.fillWidth: true
         }
         Label {
             text: " " + qsTr("End value:")
             Layout.column: 2
-            Layout.row: 0
+            Layout.row: 1
         }
         SpinBox {
             id: endValueSpinBox
@@ -73,14 +97,14 @@ Dialog {
                 focus = false;
             }
             Layout.column: 3
-            Layout.row: 0
+            Layout.row: 1
             Layout.fillWidth: true
         }
         Label {
             text: qsTr("Start line:")
             width: parent.width
             Layout.column: 0
-            Layout.row: 1
+            Layout.row: 2
         }
         SpinBox {
             id: startLineSpinBox
@@ -93,13 +117,13 @@ Dialog {
                 focus = false;
             }
             Layout.column: 1
-            Layout.row: 1
+            Layout.row: 2
             Layout.fillWidth: true
         }
         Label {
             text: " " + qsTr("End line:")
             Layout.column: 2
-            Layout.row: 1
+            Layout.row: 2
         }
         SpinBox {
             id: endLineSpinBox
@@ -112,7 +136,7 @@ Dialog {
                 focus = false;
             }
             Layout.column: 3
-            Layout.row: 1
+            Layout.row: 2
             Layout.fillWidth: true
         }
     }
diff --git a/src/view/qml/Main.qml b/src/view/qml/Main.qml
@@ -213,19 +213,19 @@ ApplicationWindow {
         id: columnVelocityInterpolationDialog
         anchors.centerIn: parent
         width: parent.width * Constants.defaultDialogScale
-        onAccepted: editorService.requestLinearVelocityInterpolationOnColumn(startLine(), endLine(), startValue(), endValue())
+        onAccepted: editorService.requestLinearVelocityInterpolationOnColumn(startLine(), endLine(), startValue(), endValue(), usePercentages())
     }
     InterpolationDialog {
         id: trackVelocityInterpolationDialog
         anchors.centerIn: parent
         width: parent.width * Constants.defaultDialogScale
-        onAccepted: editorService.requestLinearVelocityInterpolationOnTrack(startLine(), endLine(), startValue(), endValue())
+        onAccepted: editorService.requestLinearVelocityInterpolationOnTrack(startLine(), endLine(), startValue(), endValue(), usePercentages())
     }
     InterpolationDialog {
         id: selectionVelocityInterpolationDialog
         anchors.centerIn: parent
         width: parent.width * Constants.defaultDialogScale
-        onAccepted: editorService.requestLinearVelocityInterpolationOnSelection(startLine(), endLine(), startValue(), endValue())
+        onAccepted: editorService.requestLinearVelocityInterpolationOnSelection(startLine(), endLine(), startValue(), endValue(), usePercentages())
     }
     AddMidiCcAutomationDialog {
         id: addMidiCcAutomationDialog

Original file line number	Diff line number	Diff line change
`@@ -1238,39 +1238,39 @@ void EditorService::requestSelectionTranspose(int semitones)`
`1238`	`1238`	`}`
`1239`	`1239`	`}`
`1240`	`1240`
`1241`		`-void EditorService::requestLinearVelocityInterpolationOnColumn(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue)`
	`1241`	`+void EditorService::requestLinearVelocityInterpolationOnColumn(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue, bool usePercentages)`
`1242`	`1242`	`{`
`1243`	`1243`	`auto start = position();`
`1244`	`1244`	`start.line = startLine;`
`1245`	`1245`
`1246`	`1246`	`auto end = position();`
`1247`	`1247`	`end.line = endLine;`
`1248`	`1248`
`1249`		`- if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnColumn(m_song, start, end, startValue, endValue); !changedPositions.empty()) {`
	`1249`	`+ if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnColumn(m_song, start, end, startValue, endValue, usePercentages); !changedPositions.empty()) {`
`1250`	`1250`	`for (auto && position : changedPositions) {`
`1251`	`1251`	`emit noteDataAtPositionChanged(position);`
`1252`	`1252`	`}`
`1253`	`1253`	`setIsModified(true);`
`1254`	`1254`	`}`
`1255`	`1255`	`}`
`1256`	`1256`
`1257`		`-void EditorService::requestLinearVelocityInterpolationOnTrack(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue)`
	`1257`	`+void EditorService::requestLinearVelocityInterpolationOnTrack(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue, bool usePercentages)`
`1258`	`1258`	`{`
`1259`	`1259`	`auto start = position();`
`1260`	`1260`	`start.line = startLine;`
`1261`	`1261`
`1262`	`1262`	`auto end = position();`
`1263`	`1263`	`end.line = endLine;`
`1264`	`1264`
`1265`		`- if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnTrack(m_song, start, end, startValue, endValue); !changedPositions.empty()) {`
	`1265`	`+ if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnTrack(m_song, start, end, startValue, endValue, usePercentages); !changedPositions.empty()) {`
`1266`	`1266`	`for (auto && position : changedPositions) {`
`1267`	`1267`	`emit noteDataAtPositionChanged(position);`
`1268`	`1268`	`}`
`1269`	`1269`	`setIsModified(true);`
`1270`	`1270`	`}`
`1271`	`1271`	`}`
`1272`	`1272`
`1273`		`-void EditorService::requestLinearVelocityInterpolationOnSelection(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue)`
	`1273`	`+void EditorService::requestLinearVelocityInterpolationOnSelection(quint64 startLine, quint64 endLine, quint8 startValue, quint8 endValue, bool usePercentages)`
`1274`	`1274`	`{`
`1275`	`1275`	`if (m_selectionService->isValidSelection()) {`
`1276`	`1276`	`for (auto column = m_selectionService->minColumn(); column <= m_selectionService->maxColumn(); column++) {`
`@@ -1283,7 +1283,7 @@ void EditorService::requestLinearVelocityInterpolationOnSelection(quint64 startL`
`1283`	`1283`	`end.column = column;`
`1284`	`1284`	`end.line = endLine;`
`1285`	`1285`
`1286`		`- if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnColumn(m_song, start, end, startValue, endValue); !changedPositions.empty()) {`
	`1286`	`+ if (const auto changedPositions = NoteDataManipulator::interpolateVelocityOnColumn(m_song, start, end, startValue, endValue, usePercentages); !changedPositions.empty()) {`
`1287`	`1287`	`for (auto && position : changedPositions) {`
`1288`	`1288`	`emit noteDataAtPositionChanged(position);`
`1289`	`1289`	`}`