fix #33726

musescore · Nov 3, 2014 · 4ff52ea · 4ff52ea · Jojo-Schmitz · Nov 4, 2014
1 parent 647c643
commit 4ff52ea
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/libmscore/excerpt.cpp b/libmscore/excerpt.cpp
@@ -97,8 +97,9 @@ static void localSetScore(void* score, Element* element)
 //   createExcerpt
 //---------------------------------------------------------
 
-void createExcerpt(Score* score, const QList<Part*>& parts)
+void createExcerpt(Score* score, Excerpt* excerpt)
       {
+      QList<Part*>& parts = excerpt->parts();
       QList<int> srcStaves;
 
       Score* oscore = parts.front()->score();
@@ -149,7 +150,7 @@ void createExcerpt(Score* score, const QList<Part*>& parts)
 
       VBox* titleFramePart = static_cast<VBox*>(measure);
       titleFramePart->copyValues(titleFrameScore);
-      QString partLabel = parts.front()->longName();
+      QString partLabel = excerpt->title();     // parts.front()->longName();
       if (!partLabel.isEmpty()) {
             Text* txt = new Text(score);
             txt->setTextStyleType(TextStyleType::INSTRUMENT_EXCERPT);

diff --git a/libmscore/excerpt.h b/libmscore/excerpt.h
@@ -43,7 +43,7 @@ class Excerpt {
       void setTitle(const QString& s) { _title = s; }
       };
 
-extern void createExcerpt(Score*, const QList<Part*>&);
+extern void createExcerpt(Score*, Excerpt*);
 extern void cloneStaves(Score* oscore, Score* score, const QList<int>& map);
 extern void cloneStaff(Staff* ostaff, Staff* nstaff);
 extern void cloneStaff2(Staff* ostaff, Staff* nstaff, int stick, int etick);

diff --git a/libmscore/read114.cpp b/libmscore/read114.cpp
@@ -752,12 +752,7 @@ Score::FileError Score::read114(XmlReader& e)
                   excerpt->setScore(nscore);
                   nscore->setName(excerpt->title());
                   nscore->style()->set(StyleIdx::createMultiMeasureRests, true);
-                  Ms::createExcerpt(nscore, excerpt->parts());
-                  nscore->rebuildMidiMapping();
-                  nscore->updateChannel();
-                  nscore->updateNotes();
-                  nscore->addLayoutFlags(LayoutFlag::FIX_PITCH_VELO);
-                  nscore->doLayout();
+                  Ms::createExcerpt(nscore, excerpt);
                   }
             }
 

diff --git a/mscore/excerptsdialog.cpp b/mscore/excerptsdialog.cpp
@@ -292,14 +292,9 @@ void ExcerptsDialog::createExcerptClicked(QListWidgetItem* cur)
 
       score->startCmd();
       score->undo(new AddExcerpt(nscore));
-      Ms::createExcerpt(nscore, e->parts());
+      Ms::createExcerpt(nscore, e);
       score->endCmd();
 
-      nscore->rebuildMidiMapping();
-      nscore->updateChannel();
-      nscore->addLayoutFlags(LayoutFlag::FIX_PITCH_VELO);
-      nscore->setLayoutAll(true);
-
       partList->setEnabled(false);
       title->setEnabled(false);
       }