fix #124912: Mass insert single measure repeats

musescore · Sep 26, 2013 · 3226ca6 · 3226ca6
1 parent fb9de0a
commit 3226ca6
Show file tree

Hide file tree

Showing 3 changed files with 49 additions and 32 deletions.
diff --git a/libmscore/measure.cpp b/libmscore/measure.cpp
@@ -1488,39 +1488,8 @@ qDebug("drop staffList");
             case REPEAT_MEASURE:
                   {
                   delete e;
-                  //
-                  // see also cmdDeleteSelection()
-                  //
-                  _score->select(0, SELECT_SINGLE, 0);
-                  for (Segment* s = first(); s; s = s->next()) {
-                        if (s->segmentType() & Segment::SegChordRest) {
-                              int strack = staffIdx * VOICES;
-                              int etrack = strack + VOICES;
-                              for (int track = strack; track < etrack; ++track) {
-                                    Element* el = s->element(track);
-                                    if (el)
-                                          _score->undoRemoveElement(el);
-                                    }
-                              if (s->isEmpty())
-                                    _score->undoRemoveElement(s);
-                              }
-                        }
-                  //
-                  // add repeat measure
-                  //
-
-                  Segment* seg = undoGetSegment(Segment::SegChordRest, tick());
-                  RepeatMeasure* rm = new RepeatMeasure(_score);
-                  rm->setTrack(staffIdx * VOICES);
-                  rm->setParent(seg);
-                  _score->undoAddElement(rm);
-                  foreach(Element* el, _el) {
-                        if (el->type() == SLUR && el->staffIdx() == staffIdx)
-                              _score->undoRemoveElement(el);
-                        }
-                  return rm;
+                  return cmdInsertRepeatMeasure(staffIdx);
                   }
-
             case ICON:
                   switch(static_cast<Icon*>(e)->iconType()) {
                         case ICON_VFRAME:
@@ -1559,6 +1528,43 @@ void Measure::cmdRemoveEmptySegment(Segment* s)
             _score->undoRemoveElement(s);
       }
 
+//---------------------------------------------------------
+//   cmdInsertRepeatMeasure
+//---------------------------------------------------------
+RepeatMeasure* Measure::cmdInsertRepeatMeasure(int staffIdx)
+      {
+      //
+      // see also cmdDeleteSelection()
+      //
+      _score->select(0, SELECT_SINGLE, 0);
+      for (Segment* s = first(); s; s = s->next()) {
+            if (s->segmentType() & Segment::SegChordRest) {
+                  int strack = staffIdx * VOICES;
+                  int etrack = strack + VOICES;
+                  for (int track = strack; track < etrack; ++track) {
+                        Element* el = s->element(track);
+                        if (el)
+                              _score->undoRemoveElement(el);
+                        }
+                  if (s->isEmpty())
+                        _score->undoRemoveElement(s);
+                  }
+            }
+      //
+      // add repeat measure
+      //
+      Segment* seg = undoGetSegment(Segment::SegChordRest, tick());
+      RepeatMeasure* rm = new RepeatMeasure(_score);
+      rm->setTrack(staffIdx * VOICES);
+      rm->setParent(seg);
+      _score->undoAddElement(rm);
+      foreach(Element* el, _el) {
+            if (el->type() == SLUR && el->staffIdx() == staffIdx)
+                  _score->undoRemoveElement(el);
+            }
+      return rm;
+      }
+
 //---------------------------------------------------------
 //   adjustToLen
 //    change actual measure len, adjust elements to

diff --git a/libmscore/measure.h b/libmscore/measure.h
@@ -40,6 +40,7 @@ class TieMap;
 class AccidentalState;
 class Spanner;
 class Part;
+class RepeatMeasure;
 
 //---------------------------------------------------------
 //   MStaff
@@ -248,6 +249,8 @@ class Measure : public MeasureBase {
       QColor endBarLineColor() const            { return _endBarLineColor;     }
 
       void cmdRemoveEmptySegment(Segment* s);
+      RepeatMeasure* cmdInsertRepeatMeasure(int staffIdx);
+
       virtual void scanElements(void* data, void (*func)(void*, Element*), bool all=true) override;
       void createVoice(int track);
       void adjustToLen(Fraction);

diff --git a/libmscore/rest.cpp b/libmscore/rest.cpp
@@ -212,6 +212,8 @@ bool Rest::acceptDrop(MuseScoreView*, const QPointF&, Element* e) const
          ) {
             return true;
             }
+      if(type == REPEAT_MEASURE && durationType().type() == TDuration::V_MEASURE)
+            return true;
       return false;
       }
 
@@ -255,6 +257,12 @@ Element* Rest::drop(const DropData& data)
                   delete e;
                   }
                   break;
+            case REPEAT_MEASURE:
+                  delete e;
+                  if (durationType().type() == TDuration::V_MEASURE) {
+                        measure()->cmdInsertRepeatMeasure(staffIdx());
+                        }
+                  break;
             default:
                   return ChordRest::drop(data);
             }