Merge pull request #2055 from MarcSabatella/64506-repeat-measure-dura…

…tion fix #64506: temporary corruption on add of measure repeat
musescore · Jun 10, 2015 · 3507567 · 3507567
2 parents 8156e08 + 6ee93fb
commit 3507567
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 6 deletions.
diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -1741,7 +1741,7 @@ void Score::deleteItem(Element* el)
                   removeChordRest(rm, false);
                   Rest* rest = new Rest(this);
                   rest->setDurationType(TDuration::DurationType::V_MEASURE);
-                  rest->setDuration(rm->measure()->len());
+                  rest->setDuration(rm->measure()->stretchedLen(rm->staff()));
                   rest->setTrack(rm->track());
                   rest->setParent(rm->parent());
                   Segment* segment = rm->segment();

diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -1515,6 +1515,8 @@ RepeatMeasure* Measure::cmdInsertRepeatMeasure(int staffIdx)
       RepeatMeasure* rm = new RepeatMeasure(_score);
       rm->setTrack(staffIdx * VOICES);
       rm->setParent(seg);
+      rm->setDurationType(TDuration::DurationType::V_MEASURE);
+      rm->setDuration(stretchedLen(_score->staff(staffIdx)));
       _score->undoAddCR(rm, this, tick());
       foreach (Element* el, _el) {
             if (el->type() == Element::Type::SLUR && el->staffIdx() == staffIdx)

diff --git a/libmscore/repeat.cpp b/libmscore/repeat.cpp
@@ -77,7 +77,7 @@ void RepeatMeasure::layout()
 Fraction RepeatMeasure::duration() const
       {
       if (measure())
-            return measure()->len();
+            return measure()->stretchedLen(staff());
       return Fraction(0, 1);
       }
 

diff --git a/mscore/debugger/debugger.cpp b/mscore/debugger/debugger.cpp
@@ -591,6 +591,7 @@ void Debugger::updateElement(Element* el)
                   case Element::Type::MEASURE:          ew = new MeasureView;         break;
                   case Element::Type::CHORD:            ew = new ChordDebug;          break;
                   case Element::Type::NOTE:             ew = new ShowNoteWidget;      break;
+                  case Element::Type::REPEAT_MEASURE:
                   case Element::Type::REST:             ew = new RestView;            break;
                   case Element::Type::CLEF:             ew = new ClefView;            break;
                   case Element::Type::TIMESIG:          ew = new TimeSigView;         break;
@@ -1205,7 +1206,7 @@ void ShowNoteWidget::accidentalClicked()
 RestView::RestView()
    : ShowElementBase()
       {
-      // chort rest
+      // chord rest
       crb.setupUi(addWidget());
       crb.beamMode->addItem("auto");
       crb.beamMode->addItem("beam begin");

diff --git a/mtest/guitarpro/repeated-bars.gpx-ref.mscx b/mtest/guitarpro/repeated-bars.gpx-ref.mscx
@@ -183,9 +183,9 @@
       <Measure number="2">
         <RepeatMeasure>
           <lid>15</lid>
+          <durationType>measure</durationType>
           <duration z="4" n="4"/>
           </RepeatMeasure>
-        <tick>3840</tick>
         <BarLine>
           <subtype>end</subtype>
           <span>1</span>
@@ -396,9 +396,9 @@
         <Measure number="2">
           <RepeatMeasure>
             <lid>15</lid>
+            <durationType>measure</durationType>
             <duration z="4" n="4"/>
             </RepeatMeasure>
-          <tick>3840</tick>
           <BarLine>
             <subtype>end</subtype>
             <span>1</span>
@@ -459,9 +459,9 @@
         <Measure number="2">
           <RepeatMeasure>
             <lid>15</lid>
+            <durationType>measure</durationType>
             <duration z="4" n="4"/>
             </RepeatMeasure>
-          <tick>3840</tick>
           <BarLine>
             <subtype>end</subtype>
             <span>1</span>