replaceDrumset API: add tick parameter

Author: RomanPudashkin

src/engraving/api/tests/score_tests.cpp

@@ -1236,7 +1236,7 @@ TEST_F(Engraving_ApiScoreTests, replaceDrumset)
     newDs.drum(36).name = u"Kick Drum";
 
     score->startCmd(TranslatableString::untranslatable("Replace drumset test"));
-    EditPart::replaceDrumset(score, part, u"drumset", newDs);
+    EditPart::replaceDrumset(score, part, Fraction(0, 1), newDs);
     score->endCmd();
 
     // [THEN] The drumset should have the new name
@@ -1288,7 +1288,9 @@ TEST_F(Engraving_ApiScoreTests, replaceDrumsetApi)
     ASSERT_NE(cloned, nullptr);
 
     cloned->setName(36, "Kick Drum");
-    apiScore.replaceDrumset(apiPart, cloned);
+    apiv1::Fraction tick(Fraction(0, 1));
+
+    apiScore.replaceDrumset(apiPart, &tick, cloned);
 
     // [THEN] The drumset should have the new name
     EXPECT_EQ(domPart->instrument()->drumset()->name(36), u"Kick Drum");

src/engraving/api/v1/score.cpp

@@ -382,33 +382,22 @@ bool Score::setVoiceVisible(Staff* staff, int voiceIndex, bool visible)
     return mu::engraving::EditPart::setVoiceVisible(score(), staff->staff(), voiceIndex, visible);
 }
 
-void Score::replaceDrumset(Part* part, Drumset* drumset)
+void Score::replaceDrumset(Part* part, apiv1::Fraction* tick, Drumset* drumset)
 {
     if (!part) {
         LOGW("replaceDrumset: part is null");
         return;
     }
-    if (!drumset) {
-        LOGW("replaceDrumset: drumset is null");
+    if (!tick) {
+        LOGW("setInstrumentName: tick is null");
         return;
     }
-
-    // Find the instrumentId from the part's first instrument that has a drumset
-    mu::engraving::String instrumentId;
-    for (auto pair : part->part()->instruments()) {
-        mu::engraving::Instrument* instr = pair.second;
-        if (instr && instr->drumset()) {
-            instrumentId = instr->id();
-            break;
-        }
-    }
-
-    if (instrumentId.isEmpty()) {
-        LOGW("replaceDrumset: no percussion instrument found in part");
+    if (!drumset) {
+        LOGW("replaceDrumset: drumset is null");
         return;
     }
 
-    mu::engraving::EditPart::replaceDrumset(score(), part->part(), instrumentId, *drumset->drumset());
+    mu::engraving::EditPart::replaceDrumset(score(), part->part(), tick->fraction(), *drumset->drumset());
 }
 
 void Score::insertPart(const QString& instrumentId, int index)

src/engraving/api/v1/score.h

@@ -687,14 +687,17 @@ class Score : public apiv1::ScoreElement, public muse::Contextable
 
     /** APIDOC
      * Replaces the drumset of a part's percussion instrument.
-     * Use Instrument.cloneDrumset() to get a modifiable copy, then call Drumset.setDrum()
-     * to modify entries, and finally pass the modified drumset to this method.
+     * Use Instrument.cloneDrumset() to get a modifiable copy, update it with the
+     * available Drumset setter methods (`setName()`, `setNoteHead()`, `setLine()`,
+     * `setVoice()`, `setStemDirection()`, `setShortcut()`), and then pass the
+     * modified drumset to this method.
      * @method
      * @param {Engraving.Part} part The Part object.
+     * @param {Fraction} tick The tick position (use fraction(0, 1) for the beginning).
      * @param {Engraving.Drumset} drumset The new Drumset to apply.
      * @since 4.7
     */
-    Q_INVOKABLE void replaceDrumset(apiv1::Part* part, apiv1::Drumset* drumset);
+    Q_INVOKABLE void replaceDrumset(apiv1::Part* part, apiv1::Fraction* tick, apiv1::Drumset* drumset);
 
     /** APIDOC
      * Inserts a part with the instrument defined by `instrumentId` at the given index.

src/engraving/editing/editpart.cpp

@@ -740,17 +740,15 @@ void EditPart::replacePart(Score* score, Part* oldPart, const InstrumentTemplate
     insertPart(score, templ, partIndex);
 }
 
-void EditPart::replaceDrumset(Score* score, Part* part, const String& instrumentId, const Drumset& newDrumset)
+void EditPart::replaceDrumset(Score* score, Part* part, const Fraction& tick, const Drumset& newDrumset)
 {
     if (!score || !part) {
         return;
     }
 
-    for (auto pair : part->instruments()) {
-        Instrument* instrument = pair.second;
-        if (instrument && instrument->drumset() && instrument->id() == instrumentId) {
-            score->undo(new ChangeDrumset(instrument, newDrumset, part));
-        }
+    Instrument* instrument = part->instrument(tick);
+    if (instrument) {
+        score->undo(new ChangeDrumset(instrument, newDrumset, part));
     }
 }
 

src/engraving/editing/editpart.h

@@ -241,7 +241,7 @@ class EditPart
 
     static bool setVoiceVisible(Score* score, Staff* staff, int voiceIndex, bool visible);
 
-    static void replaceDrumset(Score* score, Part* part, const String& instrumentId, const Drumset& newDrumset);
+    static void replaceDrumset(Score* score, Part* part, const Fraction& tick, const Drumset& newDrumset);
 
     static void insertPart(Score* score, const InstrumentTemplate* templ, size_t index);
     static void replacePart(Score* score, Part* oldPart, const InstrumentTemplate* templ);

src/notation/internal/notationparts.cpp

@@ -720,7 +720,14 @@ void NotationParts::replaceDrumset(const InstrumentKey& instrumentKey, const Dru
 
     if (undoable) {
         startEdit(TranslatableString("undoableAction", "Edit drumset"));
-        EditPart::replaceDrumset(score(), part, instrumentKey.instrumentId, newDrumset);
+
+        for (auto pair : part->instruments()) {
+            Instrument* instrument = pair.second;
+            if (instrument && instrument->drumset() && instrument->id() == instrumentKey.instrumentId) {
+                EditPart::replaceDrumset(score(), part, Fraction::fromTicks(pair.first), newDrumset);
+            }
+        }
+
         apply();
     } else {
         for (auto pair : part->instruments()) {