Merge pull request #4509 from dmitrio95/280775-inserttext-mmrest

fix #280775: fix inserting text elements on MM rest via shortcut
musescore · Dec 28, 2018 · 5da7b40 · 5da7b40
2 parents e34bd14 + acdc76f
commit 5da7b40
Show file tree

Hide file tree

Showing 5 changed files with 42 additions and 30 deletions.
diff --git a/libmscore/chordrest.cpp b/libmscore/chordrest.cpp
@@ -1297,5 +1297,21 @@ bool ChordRest::isBefore(ChordRest* o)
       return t < otick;
       }
 
+//---------------------------------------------------------
+//   undoAddAnnotation
+//---------------------------------------------------------
+
+void ChordRest::undoAddAnnotation(Element* a)
+      {
+      Segment* seg = segment();
+      Measure* m = measure();
+      if (m && m->isMMRest())
+            seg = m->mmRestFirst()->findSegmentR(SegmentType::ChordRest, 0);
+
+      a->setTrack(a->systemFlag() ? 0 : track());
+      a->setParent(seg);
+      score()->undoAddElement(a);
+      }
+
 }
 
diff --git a/libmscore/chordrest.h b/libmscore/chordrest.h
@@ -181,6 +181,8 @@ class ChordRest : public DurationElement {
       virtual void removeMarkings(bool keepTremolo = false);
 
       bool isBefore(ChordRest*);
+
+      void undoAddAnnotation(Element*);
       };
 
 

diff --git a/libmscore/element.cpp b/libmscore/element.cpp
@@ -1257,10 +1257,10 @@ bool Element::isPrintable() const
 //   findMeasure
 //---------------------------------------------------------
 
-Element* Element::findMeasure()
+Measure* Element::findMeasure()
       {
       if (isMeasure())
-            return this;
+            return toMeasure(this);
       else if (_parent)
             return _parent->findMeasure();
       else
@@ -1271,7 +1271,7 @@ Element* Element::findMeasure()
 //   findMeasure
 //---------------------------------------------------------
 
-const Element* Element::findMeasure() const
+const Measure* Element::findMeasure() const
       {
       Element* e = const_cast<Element*>(this);
       return e->findMeasure();

diff --git a/libmscore/element.h b/libmscore/element.h
@@ -175,8 +175,8 @@ class Element : public ScoreElement {
 
       Element* parent() const                 { return _parent;     }
       void setParent(Element* e)              { _parent = e;        }
-      Element* findMeasure();
-      const Element* findMeasure() const;
+      Measure* findMeasure();
+      const Measure* findMeasure() const;
       MeasureBase* findMeasureBase();
       const MeasureBase* findMeasureBase() const;
 

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -3748,7 +3748,6 @@ void ScoreView::cmdAddText(Tid tid)
             changeState(ViewState::NORMAL);
 
       TextBase* s = 0;
-      TextBase* es = 0;
       _score->startCmd();
       switch (tid) {
             case Tid::TITLE:
@@ -3765,6 +3764,7 @@ void ScoreView::cmdAddText(Tid tid)
                   s = new Text(_score, tid);
                   s->setParent(measure);
                   adjustCanvasPosition(measure, false);
+                  _score->undoAddElement(s);
                   }
                   break;
 
@@ -3774,8 +3774,7 @@ void ScoreView::cmdAddText(Tid tid)
                   if (!cr)
                         break;
                   s = new RehearsalMark(_score);
-                  s->setTrack(0);
-                  s->setParent(cr->segment());
+                  cr->undoAddAnnotation(s);
                   }
                   break;
             case Tid::STAFF:
@@ -3784,20 +3783,7 @@ void ScoreView::cmdAddText(Tid tid)
                   if (!cr)
                         break;
                   s = new StaffText(_score, Tid::STAFF);
-                  Segment* parent = 0;
-                  if (cr->segment()->measure()->isMMRest()) {     // mm hack
-                        Measure* m = cr->segment()->measure()->mmRestFirst();
-                        parent = m->findSegmentR(SegmentType::ChordRest, 0);
-                        es = new StaffText(_score, Tid::STAFF);
-                        es->setTrack(cr->track());
-                        es->setParent(cr->segment());
-                        _score->addElement(es);
-                        s->linkTo(es);
-                        }
-                  else
-                        parent = cr->segment();
-                  s->setTrack(cr->track());
-                  s->setParent(parent);
+                  cr->undoAddAnnotation(s);
                   }
                   break;
             case Tid::SYSTEM:
@@ -3806,8 +3792,7 @@ void ScoreView::cmdAddText(Tid tid)
                   if (!cr)
                         break;
                   s = new SystemText(_score, Tid::SYSTEM);
-                  s->setTrack(0);
-                  s->setParent(cr->segment());
+                  cr->undoAddAnnotation(s);
                   }
                   break;
             case Tid::EXPRESSION:
@@ -3816,9 +3801,8 @@ void ScoreView::cmdAddText(Tid tid)
                   if (!cr)
                         break;
                   s = new StaffText(_score, Tid::EXPRESSION);
-                  s->setTrack(cr->track());
                   s->setPlacement(Placement::BELOW);
-                  s->setParent(cr->segment());
+                  cr->undoAddAnnotation(s);
                   }
                   break;
             case Tid::INSTRUMENT_CHANGE:
@@ -3827,8 +3811,7 @@ void ScoreView::cmdAddText(Tid tid)
                   if (!cr)
                         break;
                   s = new InstrumentChange(_score);
-                  s->setTrack(cr->track());
-                  s->setParent(cr->segment());
+                  cr->undoAddAnnotation(s);
                   }
                   break;
             case Tid::FINGERING:
@@ -3843,17 +3826,28 @@ void ScoreView::cmdAddText(Tid tid)
                   s = new Fingering(_score);
                   s->setTrack(e->track());
                   s->setParent(e);
+                  _score->undoAddElement(s);
                   }
                   break;
             default:
                   break;
             }
 
       if (s) {
-            _score->undoAddElement(s);
             _score->select(s, SelectType::SINGLE, 0);
             _score->endCmd();
-            startEditMode(es ? es : s);
+            Measure* m = s->findMeasure();
+            if (m && m->hasMMRest() && s->links()) {
+                  Measure* mmRest = m->mmRest();
+                  for (ScoreElement* se : *s->links()) {
+                        TextBase* s1 = toTextBase(se);
+                        if (s != s1 && s1->findMeasure() == mmRest) {
+                              s = s1;
+                              break;
+                              }
+                        }
+                  }
+            startEditMode(s);
             }
       else
             _score->endCmd();