Merge pull request #6743 from njvdberg/issue-257581-linking-measures

Fix #257581, Fix #64636 - Changes to Measure properties are not propagated between score and existing linked parts
musescore · Nov 17, 2020 · 5431550 · 5431550
2 parents 1cfa41c + 529fe7f
commit 5431550
Show file tree

Hide file tree

Showing 2 changed files with 24 additions and 0 deletions.
diff --git a/libmscore/read302.cpp b/libmscore/read302.cpp
@@ -24,6 +24,7 @@
 #include "excerpt.h"
 #include "spanner.h"
 #include "scoreOrder.h"
+#include "measurebase.h"
 
 #ifdef OMR
 #include "omr/omr.h"
@@ -192,6 +193,7 @@ bool Score::read(XmlReader& e)
                         ex->setPartScore(s);
                         e.setLastMeasure(nullptr);
                         s->read(e);
+                        s->linkMeasures(m);
                         ex->setTracks(e.tracks());
                         m->addExcerpt(ex);
                         }
@@ -315,6 +317,27 @@ bool Score::read(XmlReader& e)
       return true;
       }
 
+//---------------------------------------------------------
+// linkMeasures
+//---------------------------------------------------------
+
+void Score::linkMeasures(Score* score)
+      {
+      MeasureBase *mbMaster = score->first();
+      for (MeasureBase* mb = first(); mb; mb = mb->next()) {
+            if (!mb->isMeasure())
+                  continue;
+            while (mbMaster && !mbMaster->isMeasure())
+                  mbMaster = mbMaster->next();
+            if (!mbMaster) {
+                  qDebug("Measures in MasterScore and Score are not in sync.");
+                  break;
+                  }
+            mb->linkTo(mbMaster);
+            mbMaster = mbMaster->next();
+            }
+      }
+
 //---------------------------------------------------------
 //   read
 //---------------------------------------------------------

diff --git a/libmscore/score.h b/libmscore/score.h
@@ -609,6 +609,7 @@ class Score : public QObject, public ScoreElement {
       void addMeasure(MeasureBase*, MeasureBase*);
       void readStaff(XmlReader&);
       bool read(XmlReader&);
+      void linkMeasures(Score* score);
 
       Excerpt* excerpt()            { return _excerpt; }
       void setExcerpt(Excerpt* e)   { _excerpt = e;     }