Merge pull request #3937 from handrok/fix#271616-Fermata_tempo

fix #271616: Fermata tempo is not applied when importing 2.X->3.0 score
musescore · Sep 14, 2018 · fb9dcac · fb9dcac
2 parents 619c132 + 34cf407
commit fb9dcac
Show file tree

Hide file tree

Showing 10 changed files with 677 additions and 24 deletions.
diff --git a/libmscore/layout.cpp b/libmscore/layout.cpp
@@ -2449,6 +2449,7 @@ void Score::getNextMeasure(LayoutContext& lc)
                   }
             }
 
+      measure->computeTicks();
       for (Segment& segment : measure->segments()) {
             if (segment.isBreathType()) {
                   qreal length = 0.0;
@@ -3817,6 +3818,11 @@ void Score::doLayoutRange(int stick, int etick)
 
       lc.prevMeasure = 0;
 
+      // we need to reset tempo because fermata is setted 
+      //inside getNextMeasure and it lead to twice timeStretch
+      if (isMaster())
+            resetTempo();
+
       getNextMeasure(lc);
       lc.curSystem = collectSystem(lc);
 

diff --git a/libmscore/layoutlinear.cpp b/libmscore/layoutlinear.cpp
@@ -115,6 +115,9 @@ static void processLines(System* system, std::vector<Spanner*> lines, bool align
  void Score::collectLinearSystem(LayoutContext& lc)
       {
       System* system = systems().front();
+      // we need to reset tempo because fermata is setted 
+      //inside getNextMeasure and it lead to twice timeStretch
+      resetTempo();
 
       QPointF pos;
       bool firstMeasure = true;

diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -3514,29 +3514,7 @@ void Measure::stretchMeasure(qreal targetWidth)
       {
       bbox().setWidth(targetWidth);
 
-      //---------------------------------------------------
-      //    compute minTick and set ticks for all segments
-      //---------------------------------------------------
-
-      int minTick = ticks();
-      if (minTick <= 0) {
-            qDebug("=====minTick %d measure %p", minTick, this);
-            }
-      Q_ASSERT(minTick > 0);
-
-      Segment* ns = first();
-      while (ns && !ns->enabled())
-            ns = ns->next();
-      while (ns) {
-            Segment* s = ns;
-            ns         = s->nextEnabled();
-            int nticks = (ns ? ns->rtick() : ticks()) - s->rtick();
-            if (nticks) {
-                  if (nticks < minTick)
-                        minTick = nticks;
-                  }
-            s->setTicks(nticks);
-            }
+      int minTick = computeTicks();
 
       //---------------------------------------------------
       //    compute stretch
@@ -3670,6 +3648,36 @@ void Measure::stretchMeasure(qreal targetWidth)
             }
       }
 
+//---------------------------------------------------
+//    computeTicks
+//    set ticks for all segments
+//       return minTick 
+//---------------------------------------------------
+
+int Measure::computeTicks() {
+      int minTick = ticks();
+      if (minTick <= 0) {
+            qDebug("=====minTick %d measure %p", minTick, this);
+            }
+      Q_ASSERT(minTick > 0);
+
+      Segment* ns = first();
+      while (ns && !ns->enabled())
+            ns = ns->next();
+      while (ns) {
+            Segment* s = ns;
+            ns         = s->nextEnabled();
+            int nticks = (ns ? ns->rtick() : ticks()) - s->rtick();
+            if (nticks) {
+                  if (nticks < minTick)
+                        minTick = nticks;
+                  }
+            s->setTicks(nticks);
+            }
+
+      return minTick;
+}
+
 //---------------------------------------------------------
 //   endBarLine
 //      return the first one

diff --git a/libmscore/measure.h b/libmscore/measure.h
@@ -159,6 +159,7 @@ class Measure final : public MeasureBase {
       void setUserStretch(qreal v)              { _userStretch = v; }
 
       void stretchMeasure(qreal stretch);
+      int computeTicks();
       void layout2();
 
       Chord* findChord(int tick, int track);

diff --git a/libmscore/read206.cpp b/libmscore/read206.cpp
@@ -1664,6 +1664,10 @@ Element* readArticulation(ChordRest* cr, XmlReader& e)
                               el->readProperties300(e);
                         }
                   }
+            else if (tag == "timeStretch") {
+                  if (el && el->isFermata())
+                        el->setProperty(Pid::TIME_STRETCH ,e.readDouble()); 
+                  }
             else {
                   if (!el) {
                         qDebug("not handled <%s>", qPrintable(tag.toString()));

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -464,7 +464,7 @@ void Score::fixTicks()
             }
       // Now done in getNextMeasure(), do we keep?
       if (tempomap()->empty())
-            tempomap()->setTempo(0, 2.0);
+            tempomap()->setTempo(0, defaultTempo);
       }
 
 //---------------------------------------------------------
@@ -3259,6 +3259,17 @@ void Score::removeTempo(int tick)
       _playlistDirty = true;
       }
 
+//---------------------------------------------------------
+//   resetTempo
+//---------------------------------------------------------
+
+void Score::resetTempo() {
+      tempomap()->clear();
+      tempomap()->setTempo(0, defaultTempo);
+      sigmap()->clear();
+      sigmap()->add(0, SigEvent(firstMeasure()->len(),  firstMeasure()->timesig(), 0));
+      }
+
 //---------------------------------------------------------
 //   setPause
 //---------------------------------------------------------

diff --git a/libmscore/score.h b/libmscore/score.h
@@ -443,6 +443,7 @@ class Score : public QObject, public ScoreElement {
 
       QMap<QString, QString> _metaTags;
 
+      constexpr static double defaultTempo = 2.0; //defautl tempo is equal 120 bpm
 
       Selection _selection;
       SelectionFilter _selectionFilter;
@@ -510,6 +511,7 @@ class Score : public QObject, public ScoreElement {
 
       void resetSystems(bool layoutAll, LayoutContext& lc);
       void collectLinearSystem(LayoutContext& lc);
+      void resetTempo();
 
    protected:
       int _fileDivision; ///< division of current loading *.msc file