fix #240166: Barlines extend over multiple staves by adding a staff/s…

…tave to an instrument
musescore · Aug 4, 2017 · e65a269 · e65a269
1 parent b889608
commit e65a269
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 28 deletions.
diff --git a/libmscore/instrtemplate.cpp b/libmscore/instrtemplate.cpp
@@ -132,7 +132,7 @@ InstrumentTemplate::InstrumentTemplate()
             smallStaff[i]  = false;
             bracket[i]     = BracketType::NO_BRACKET;
             bracketSpan[i] = 0;
-            barlineSpan[i] = 0;
+            barlineSpan[i] = false;
             }
       transpose.diatonic   = 0;
       transpose.chromatic  = 0;
@@ -340,8 +340,8 @@ void InstrumentTemplate::read(XmlReader& e)
             else if (tag == "staves") {
                   staves = e.readInt();
                   bracketSpan[0] = staves;
-                  for (int i = 0; i < staves-1; ++i)
-                        barlineSpan[i] = true;
+//                  for (int i = 0; i < staves-1; ++i)
+//                        barlineSpan[i] = true;
                   }
             else if (tag == "clef") {           // sets both transposing and concert clef
                   int idx = readStaffIdx(e);
@@ -474,25 +474,6 @@ void InstrumentTemplate::read(XmlReader& e)
             else
                   e.unknown();
             }
-      //
-      // check bar line spans
-      //
-      int barLine = 0;
-      for (int i = 0; i < staves; ++i) {
-            int bls = barlineSpan[i];
-            if (barLine) {
-                  if (bls)
-                        barlineSpan[i] = 0;
-                  }
-            else {
-                  if (bls == 0) {
-                        bls = 1;
-                        barlineSpan[i] = 1;
-                        }
-                  barLine = bls;
-                  }
-            --barLine;
-            }
       if (channel.empty()) {
             Channel a;
             a.chorus       = 0;

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -3388,7 +3388,6 @@ void Score::appendPart(const QString& name)
                   }
             undoInsertStaff(staff, i);
             }
-
       part->staves()->front()->setBarLineSpan(part->nstaves());
       undoInsertPart(part, n);
       fixTicks();

diff --git a/mscore/instrdialog.cpp b/mscore/instrdialog.cpp
@@ -286,8 +286,6 @@ void MuseScore::editInstrList()
                               linked.append(staff);
                               }
                         }
-                  if (linked.size() == 0)
-                        part->staves()->front()->setBarLineSpan(part->nstaves());
 
                   //insert keysigs
                   int sidx = masterScore->staffIdx(part);
@@ -324,7 +322,6 @@ void MuseScore::editInstrList()
 
                               Staff* linkedStaff = 0;
                               if (sli->linked()) {
-
                                     if (rstaff > 0)
                                           linkedStaff = part->staves()->front();
                                     else {

diff --git a/mscore/instrwidget.cpp b/mscore/instrwidget.cpp
@@ -984,7 +984,7 @@ void InstrumentsWidget::createInstruments(Score* cs)
                   }
             // if a staff was removed from instrument:
             if (part->staff(0)->barLineSpan() > rstaff) {
-                  part->staff(0)->setBarLineSpan(rstaff);
+//TODO                  part->staff(0)->setBarLineSpan(rstaff);
                   part->staff(0)->setBracketType(0, BracketType::NO_BRACKET);
                   }
 
@@ -996,6 +996,7 @@ void InstrumentsWidget::createInstruments(Score* cs)
                   m->cmdAddStaves(sidx, eidx, true);
             staffIdx += rstaff;
             }
+#if 0 // TODO
       //
       // check for bar lines
       //
@@ -1014,7 +1015,7 @@ void InstrumentsWidget::createInstruments(Score* cs)
 
             staffIdx = nstaffIdx;
             }
-
+#endif
       cs->setLayoutAll();
       }