Merge pull request #33925 from miiizen/33912-percNoteParen

[4.7] Sort percussion notes before reading chord parentheses

Author: mike-spa

src/engraving/dom/chord.cpp

@@ -1131,34 +1131,6 @@ bool Chord::underBeam() const
     return false;
 }
 
-//---------------------------------------------------------
-//   updatePercussionNotes
-//---------------------------------------------------------
-
-static void updatePercussionNotes(Chord* c, const Drumset* drumset)
-{
-    TRACEFUNC;
-    for (Chord* ch : c->graceNotes()) {
-        updatePercussionNotes(ch, drumset);
-    }
-    std::vector<Note*> lnotes(c->notes());    // we need a copy!
-    for (Note* note : lnotes) {
-        if (!drumset) {
-            note->setLine(0);
-        } else {
-            int pitch = note->pitch();
-            if (!drumset->isValid(pitch)) {
-                note->setLine(0);
-                //! NOTE May be called too often
-                //LOGW("unmapped drum note %d", pitch);
-            } else if (!note->fixed()) {
-                note->undoChangeProperty(Pid::HEAD_GROUP, drumset->noteHead(pitch));
-                note->setLine(drumset->line(pitch));
-            }
-        }
-    }
-}
-
 //---------------------------------------------------------
 //   cmdUpdateNotes
 //---------------------------------------------------------

src/engraving/dom/utils.cpp

@@ -1971,4 +1971,28 @@ bool noteIsBefore(const Note* n1, const Note* n2)
 
     return false;
 }
+
+void updatePercussionNotes(Chord* c, const Drumset* drumset)
+{
+    TRACEFUNC;
+    for (Chord* ch : c->graceNotes()) {
+        updatePercussionNotes(ch, drumset);
+    }
+    std::vector<Note*> lnotes(c->notes());    // we need a copy!
+    for (Note* note : lnotes) {
+        if (!drumset) {
+            note->setLine(0);
+        } else {
+            int pitch = note->pitch();
+            if (!drumset->isValid(pitch)) {
+                note->setLine(0);
+                //! NOTE May be called too often
+                //LOGW("unmapped drum note %d", pitch);
+            } else if (!note->fixed()) {
+                note->undoChangeProperty(Pid::HEAD_GROUP, drumset->noteHead(pitch));
+                note->setLine(drumset->line(pitch));
+            }
+        }
+    }
+}
 }

src/engraving/dom/utils.h

@@ -31,6 +31,7 @@
 namespace mu::engraving {
 class Chord;
 class ChordRest;
+class Drumset;
 class EngravingItem;
 class KeySig;
 class Lyrics;
@@ -133,4 +134,5 @@ extern std::vector<EngravingItem*> filterTargetElements(const Selection& sel, En
 
 extern Lyrics* searchNextLyrics(Segment* s, staff_idx_t staffIdx, int verse, PlacementV p);
 extern bool noteIsBefore(const Note* n1, const Note* n2);
+extern void updatePercussionNotes(Chord* c, const Drumset* drumset);
 } // namespace mu::engraving

src/engraving/rw/read460/tread.cpp

@@ -3836,6 +3836,18 @@ void TRead::lineBreakFromTag(String& str)
 
 void TRead::readNoteParenGroup(Chord* ch, XmlReader& e, ReadContext& ctx)
 {
+    StaffGroup staffGroup = ctx.staff(ch->staffIdx())->staffTypeForElement(ch)->group();
+    if (staffGroup == StaffGroup::PERCUSSION) {
+        // We should have read all notes by now. They need to be sorted for percussion staves
+        const Instrument* instrument = ch->part()->instrument(ch->tick());
+        const Drumset* drumset = instrument->drumset();
+        if (!drumset) {
+            LOGW("no drumset");
+        }
+        updatePercussionNotes(ch, drumset);
+        ch->sortNotes();
+    }
+
     Parenthesis* leftParen = nullptr;
     Parenthesis* rightParen = nullptr;
     std::vector<Note*> notes;