Merge pull request #33837 from miiizen/mmrests2

Fix MMRest bugs

Author: miiizen

src/engraving/dom/excerpt.cpp

@@ -1134,6 +1134,35 @@ static MeasureBase* cloneMeasure(MeasureBase* mb, Score* score, const Score* osc
     return nmb;
 }
 
+void Excerpt::cloneMMRests(Score* sourceScore, Score* dstScore, const std::vector<staff_idx_t>& sourceStavesIndexes,
+                           const TracksMap& trackList, TieMap& tieMap)
+{
+    // When MMRests are enabled in the main score and we are creating a new part or revealing a hidden stave within one, we must copy MMRests
+    // Elements are moved from underlying measures to MMRest measures. If we do not copy these MMRests, the elements attached to them will be lost
+    // It doesn't matter if the MMRest range is different in the part to the score. As long as the MMRest measure is present in the DOM, MMRestLayout will
+    // correct this, setting the appropriate length and moving the elements to the correct locations
+
+    for (Measure* srcM = sourceScore->firstMeasure(); srcM; srcM = srcM->nextMeasure()) {
+        if (!srcM->hasMMRest()) {
+            continue;
+        }
+
+        Measure* dstM = dstScore->tick2measure(srcM->tick());
+        if (!dstM) {
+            continue;
+        }
+
+        Measure* srcMMRest = srcM->mmRest();
+
+        Measure* dstMMRest = toMeasure(cloneMeasure(srcMMRest, dstScore, sourceScore, sourceStavesIndexes, trackList, tieMap));
+        dstMMRest->setMMRestCount(srcMMRest->mmRestCount());
+        dstMMRest->setPrev(dstM->prev());
+        dstMMRest->setNext(dstScore->tick2measure(srcMMRest->tick() + srcMMRest->ticks()));
+
+        dstM->setMMRest(dstMMRest);
+    }
+}
+
 void Excerpt::cloneStaves(Score* sourceScore, Score* dstScore, const std::vector<staff_idx_t>& sourceStavesIndexes,
                           const TracksMap& trackList)
 {
@@ -1157,6 +1186,8 @@ void Excerpt::cloneStaves(Score* sourceScore, Score* dstScore, const std::vector
         measures->append(newMeasure);
     }
 
+    cloneMMRests(sourceScore, dstScore, sourceStavesIndexes, trackList, tieMap);
+
     size_t n = sourceStavesIndexes.size();
     for (staff_idx_t dstStaffIdx = 0; dstStaffIdx < n; ++dstStaffIdx) {
         Staff* srcStaff = sourceScore->staff(sourceStavesIndexes[dstStaffIdx]);
@@ -1222,6 +1253,8 @@ void Excerpt::cloneMeasures(Score* oscore, Score* score)
         measures->append(newMeasure);
     }
 
+    cloneMMRests(oscore, score, {}, {}, tieMap);
+
     collectTieEndPoints(tieMap);
 }
 

src/engraving/dom/excerpt.h

@@ -36,6 +36,7 @@ class Part;
 class Score;
 class Staff;
 class Spanner;
+class TieMap;
 
 class Excerpt
 {
@@ -100,6 +101,8 @@ class Excerpt
     friend class MasterScore;
 
     static void promoteGapRestsToRealRests(const Measure* measure, staff_idx_t staffIdx);
+    static void cloneMMRests(Score* sourceScore, Score* dstScore, const std::vector<staff_idx_t>& sourceStavesIndexes,
+                             const TracksMap& trackList, TieMap& tieMap);
 
     void setInited(bool inited);
     void writeNameToMetaTags();

src/engraving/dom/measure.cpp

@@ -3028,7 +3028,7 @@ Measure* Measure::coveringMMRestOrThis()
         m = m->prevMeasure();
     }
 
-    if (m) {
+    if (m && !m->m_mmRest->mmRestLast()->isBefore(this)) {
         return m->m_mmRest;
     }
 

src/engraving/dom/mmrest.cpp

@@ -47,10 +47,6 @@ MMRest::MMRest(Segment* s)
 MMRest::MMRest(const MMRest& r, bool link)
     : Rest(r, link)
 {
-    if (link) {
-        score()->undo(new Link(this, const_cast<MMRest*>(&r)));
-        setAutoplace(true);
-    }
     m_numberVisible = r.m_numberVisible;
 }
 

src/engraving/editing/edit.cpp

@@ -2839,16 +2839,6 @@ void Score::deleteItem(EngravingItem* el)
     case ElementType::KEYSIG:
     {
         KeySig* k = toKeySig(el);
-        Measure* m = k->measure();
-        if (m->isMMRest()) {
-            m = m->mmRestFirst();
-            if (Segment* s = m->findSegment(SegmentType::KeySig, k->tick())) {
-                k = toKeySig(s->element(k->track()));
-            }
-            if (!k || k->generated()) {
-                return;
-            }
-        }
         Segment* nextCrSeg = k->segment()->next1(SegmentType::ChordRest);
         bool ic = nextCrSeg && nextCrSeg->findAnnotation(ElementType::INSTRUMENT_CHANGE,
                                                          el->part()->startTrack(), el->part()->endTrack() - 1);
@@ -3132,52 +3122,22 @@ void Score::deleteItem(EngravingItem* el)
     case ElementType::BRACKET:
         undoRemoveBracket(toBracket(el));
         break;
-
-    case ElementType::LAYOUT_BREAK:
-    {
-        undoRemoveElement(el);
-        LayoutBreak* lb = toLayoutBreak(el);
-        MeasureBase* mb = lb->measure();
-        Measure* m = mb && mb->isMeasure() ? toMeasure(mb) : nullptr;
-        if (m && m->isMMRest()) {
-            // propagate to original measure
-            m = m->mmRestLast();
-            for (EngravingItem* e : m->el()) {
-                if (e->isLayoutBreak() && toLayoutBreak(e)->layoutBreakType() == toLayoutBreak(el)->layoutBreakType()) {
-                    undoRemoveElement(e);
-                    break;
-                }
-            }
-        }
-    }
-    break;
-
     case ElementType::CLEF:
     {
         Clef* clef = toClef(el);
         Measure* m = clef->measure();
-        if (m->isMMRest()) {
-            // propagate to original measure
-            m = m->mmRestLast();
-            Segment* s = m->findSegment(SegmentType::Clef, clef->segment()->tick());
-            if (s && s->element(clef->track())) {
-                Clef* c = toClef(s->element(clef->track()));
-                undoRemoveElement(c);
-            }
-        } else {
-            if (clef->generated()) {
-                // find the real clef if this is a cautionary one
-                if (m && m->prevMeasure()) {
-                    Fraction tick = m->tick();
-                    m = m->prevMeasure();
-                    Segment* s = m->findSegment(SegmentType::Clef, tick);
-                    if (s && s->element(clef->track())) {
-                        clef = toClef(s->element(clef->track()));
-                    }
+        if (clef->generated()) {
+            // find the real clef if this is a cautionary one
+            if (m && m->prevMeasure()) {
+                Fraction tick = m->tick();
+                m = m->prevMeasure();
+                Segment* s = m->findSegment(SegmentType::Clef, tick);
+                if (s && s->element(clef->track())) {
+                    clef = toClef(s->element(clef->track()));
                 }
             }
-            undoRemoveElement(clef);
         }
+        undoRemoveElement(clef);
     }
     break;
 
@@ -3207,29 +3167,6 @@ void Score::deleteItem(EngravingItem* el)
         }
     }
     break;
-    case ElementType::REHEARSAL_MARK:
-    case ElementType::TEMPO_TEXT:
-    {
-        Segment* s = toSegment(el->explicitParent());
-        Measure* m = s->measure();
-        if (m->isMMRest()) {
-            // propagate to original measure/element
-            m = m->mmRestFirst();
-            Segment* ns = m->findSegment(SegmentType::ChordRest, s->tick());
-            const auto annotations = ns->annotations(); // make a copy since we alter the list
-            for (EngravingItem* e : annotations) {
-                if (e->type() == el->type() && e->track() == el->track()) {
-                    el = e;
-                    undoRemoveElement(el);
-                    break;
-                }
-            }
-        } else {
-            undoRemoveElement(el);
-        }
-    }
-    break;
-
     case ElementType::LYRICSLINE_SEGMENT:
     {
         el = toLyricsLineSegment(el)->lyricsLine();
@@ -3341,53 +3278,6 @@ void Score::deleteItem(EngravingItem* el)
         }
     }
     break;
-
-    case ElementType::MARKER:
-    {
-        Measure* m = toMeasure(el->explicitParent());
-        if (m->isMMRest()) {
-            // find corresponding marker in underlying measure
-            bool found = false;
-            // the marker may be in the first measure...
-            for (EngravingItem* e : m->mmRestFirst()->el()) {
-                if (e->isMarker() && e->subtype() == el->subtype()) {
-                    undoRemoveElement(e);
-                    found = true;
-                    break;
-                }
-            }
-            if (!found) {
-                // ...or it may be in the last measure
-                for (EngravingItem* e : m->mmRestLast()->el()) {
-                    if (e->isMarker() && e->subtype() == el->subtype()) {
-                        undoRemoveElement(e);
-                        break;
-                    }
-                }
-            }
-        }
-        // whether m is an mmrest or not, we still need to remove el
-        undoRemoveElement(el);
-    }
-    break;
-
-    case ElementType::JUMP:
-    {
-        Measure* m = toMeasure(el->explicitParent());
-        if (m->isMMRest()) {
-            // find corresponding jump in underlying measure
-            for (EngravingItem* e : m->mmRestLast()->el()) {
-                if (e->isJump() && e->subtype() == el->subtype()) {
-                    undoRemoveElement(e);
-                    break;
-                }
-            }
-        }
-        // whether m is an mmrest or not, we still need to remove el
-        undoRemoveElement(el);
-    }
-    break;
-
     case ElementType::SYSTEM_LOCK_INDICATOR:
     {
         const SystemLock* systemLock = toSystemLockIndicator(el)->systemLock();

src/engraving/editing/editmeasures.cpp

@@ -408,3 +408,21 @@ void ChangeMeasureRepeatCount::flip(EditData*)
     m->setMeasureRepeatCount(count, staffIdx);
     count = oldCount;
 }
+
+void ChangeMMRestNext::flip(EditData*)
+{
+    assert(m_mmrest->isMMRest());
+    MeasureBase* oldNext = m_mmrest->next();
+
+    m_mmrest->setNext(m_next);
+    m_next = oldNext;
+}
+
+void ChangeMMRestPrev::flip(EditData*)
+{
+    assert(m_mmrest->isMMRest());
+    MeasureBase* oldPrev = m_mmrest->prev();
+
+    m_mmrest->setPrev(m_prev);
+    m_prev = oldPrev;
+}

src/engraving/editing/editmeasures.h

@@ -110,6 +110,41 @@ class ChangeMMRest : public UndoableCommand
     UNDO_CHANGED_OBJECTS({ m, mmrest })
 };
 
+// ChangeMMRestNext & ChangeMMRestPrev SHOULD ONLY BE USED FOR MMRests
+// Setting m_next & m_prev involves the score's MeasureList for regular measures
+// This is handled through undo commands above
+class ChangeMMRestNext : public UndoableCommand
+{
+    OBJECT_ALLOCATOR(engraving, ChangeMMRestNext)
+
+    Measure* m_mmrest = nullptr;
+    MeasureBase* m_next = nullptr;
+
+    void flip(EditData*) override;
+public:
+    ChangeMMRestNext(Measure* mmrest, MeasureBase* next)
+        : m_mmrest(mmrest), m_next(next) {}
+
+    UNDO_NAME("ChangeMMRestNext")
+    UNDO_CHANGED_OBJECTS({ m_mmrest })
+};
+
+class ChangeMMRestPrev : public UndoableCommand
+{
+    OBJECT_ALLOCATOR(engraving, ChangeMMRestPrev)
+
+    Measure* m_mmrest = nullptr;
+    MeasureBase* m_prev = nullptr;
+
+    void flip(EditData*) override;
+public:
+    ChangeMMRestPrev(Measure* mmrest, MeasureBase* prev)
+        : m_mmrest(mmrest), m_prev(prev) {}
+
+    UNDO_NAME("ChangeMMRestPrev")
+    UNDO_CHANGED_OBJECTS({ m_mmrest })
+};
+
 class ChangeMeasureRepeatCount : public UndoableCommand
 {
     OBJECT_ALLOCATOR(engraving, ChangeMeasureRepeatCount)