Merge pull request #6110 from njvdberg/issue-305656-double-parts

Fix #305656 Two piano instruments shown for a single piano part after…
musescore · Jun 6, 2020 · 7189a88 · 7189a88
2 parents 4174c96 + c5de914
commit 7189a88
Show file tree

Hide file tree

Showing 4 changed files with 24 additions and 3 deletions.
diff --git a/libmscore/excerpt.cpp b/libmscore/excerpt.cpp
@@ -63,6 +63,18 @@ Excerpt::~Excerpt() {
       delete _partScore;
       }
 
+//---------------------------------------------------------
+//   nstaves
+//---------------------------------------------------------
+
+int Excerpt::nstaves() const
+      {
+      int n { 0 };
+      for (Part* p : _parts)
+            n += p->nstaves();
+      return n;
+      }
+
 //---------------------------------------------------------
 //   read
 //---------------------------------------------------------

diff --git a/libmscore/excerpt.h b/libmscore/excerpt.h
@@ -49,6 +49,7 @@ class Excerpt : public QObject {
       QList<Part*>& parts()                { return _parts;     }
       void setParts(const QList<Part*>& p) { _parts = p;        }
 
+      int nstaves() const;
 
       QMultiMap<int, int>& tracks()                  { return _tracks;    }
       void setTracks(const QMultiMap<int, int>& t)   { _tracks = t;       }

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -1898,16 +1898,24 @@ void MasterScore::addExcerpt(Excerpt* ex)
       {
       Score* score = ex->partScore();
 
+      int nstaves { 1 }; // Initialise to 1 to force writing of the first part.
       for (Staff* s : score->staves()) {
             const LinkedElements* ls = s->links();
             if (ls == 0)
                   continue;
             for (auto le : *ls) {
+                  if (le->score() != this)
+                        continue;
+
+                  // For instruments with multiple staves, every staff will point to the
+                  // same part. To prevent adding the same part several times to the excerpt,
+                  // add only the part of the first staff pointing to the part.
                   Staff* ps = toStaff(le);
-                  if (ps->score() == this) {
+                  if (!(--nstaves)) {
                         ex->parts().append(ps->part());
-                        break;
+                        nstaves = ps->part()->nstaves();
                         }
+                  break;
                   }
             }
       if (ex->tracks().isEmpty()) {      // SHOULDN'T HAPPEN, protected in the UI, but it happens during read-in!!!

diff --git a/libmscore/scorefile.cpp b/libmscore/scorefile.cpp
@@ -113,7 +113,7 @@ void Score::writeMovement(XmlWriter& xml, bool selectionOnly)
             Excerpt* e = excerpt();
             QMultiMap<int, int> trackList = e->tracks();
             QMapIterator<int, int> i(trackList);
-            if (!(trackList.size() == e->parts().size() * VOICES) && !trackList.isEmpty()) {
+            if (!(trackList.size() == e->nstaves() * VOICES) && !trackList.isEmpty()) {
                   while (i.hasNext()) {
                       i.next();
                       xml.tagE(QString("Tracklist sTrack=\"%1\" dstTrack=\"%2\"").arg(i.key()).arg(i.value()));