automatic to create unique rehearsal marks

chenlung · Nov 15, 2014 · c511c86 · c511c86
1 parent d8e1c74
commit c511c86
Show file tree

Hide file tree

Showing 6 changed files with 73 additions and 24 deletions.
diff --git a/demos/Triumph.mscz b/demos/Triumph.mscz
diff --git a/libmscore/chordrest.cpp b/libmscore/chordrest.cpp
@@ -849,6 +849,8 @@ Element* ChordRest::drop(const DropData& data)
                   TextStyleType st = f->textStyleType();
                   if (st >= TextStyleType::DEFAULT)
                         f->setTextStyleType(st);
+                  if (e->type() == Element::Type::REHEARSAL_MARK)
+                        f->setText(score()->createRehearsalmarkText(segment()->tick()));
                   }
                   score()->undoAddElement(e);
                   return e;

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -67,6 +67,7 @@
 #include "instrtemplate.h"
 #include "cursor.h"
 #include "sym.h"
+#include "rehearsalmark.h"
 
 namespace Ms {
 
@@ -3587,5 +3588,45 @@ QString Score::title()
       return fn.simplified();
       }
 
+//---------------------------------------------------------
+//   createRehearsalmarkText
+//---------------------------------------------------------
+
+QString Score::createRehearsalmarkText(int tick) const
+      {
+      RehearsalMark* before = 0;
+      RehearsalMark* after = 0;
+      for (Segment* s = firstSegment(); s; s = s->next1()) {
+            for (Element* e : s->annotations()) {
+                  if (e && e->type() == Element::Type::REHEARSAL_MARK) {
+                        if (s->tick() < tick)
+                              before = static_cast<RehearsalMark*>(e);
+                        else if (s->tick() > tick) {
+                              after = static_cast<RehearsalMark*>(e);
+                              break;
+                              }
+                        }
+                  }
+            if (after)
+                  break;
+            }
+      QString s = "A";
+      QString s1 = before ? before->text() : "";
+      QString s2 = after ? after->text()  : "";
+//      qDebug("createRehearsalMark <%s> xx <%s>", qPrintable(s1), qPrintable(s2));
+      if (s1.isEmpty())
+            return s;
+      if (!s2.isEmpty()) {
+            s = s1[0];
+            if (s1.size() > 1)
+                  s += QChar::fromLatin1(s1[1].toLatin1() + 1);
+            else
+                  s += QChar::fromLatin1('1');
+            }
+      else
+            s = QChar::fromLatin1(s1[0].toLatin1() + 1);
+      return s;
+      }
+
 }
 
diff --git a/libmscore/score.h b/libmscore/score.h
@@ -1008,6 +1008,7 @@ class Score : public QObject {
       QString accessibleInfo()          { return accInfo;          }
 
       QImage createThumbnail();
+      QString createRehearsalmarkText(int tick) const;
 
       friend class ChangeSynthesizerState;
       friend class Chord;

diff --git a/mscore/musescore.cpp b/mscore/musescore.cpp
@@ -2980,28 +2980,6 @@ void MuseScore::hideProgressBar()
             _statusBar->removeWidget(_progressBar);
       }
 
-//---------------------------------------------------------
-//   searchTextChanged
-//---------------------------------------------------------
-
-void MuseScore::searchTextChanged(const QString& s)
-      {
-      if (cv == 0)
-            return;
-      cv->search(s);
-      }
-
-//---------------------------------------------------------
-//   endSearch
-//---------------------------------------------------------
-
-void MuseScore::endSearch()
-      {
-      _searchDialog->hide();
-      if (cv)
-            cv->setFocus();
-      }
-
 //---------------------------------------------------------
 //   handleMessage
 //---------------------------------------------------------
@@ -4360,6 +4338,28 @@ void MuseScore::updateDrumTools()
             _drumTools->updateDrumset();
       }
 
+//---------------------------------------------------------
+//   searchTextChanged
+//---------------------------------------------------------
+
+void MuseScore::searchTextChanged(const QString& s)
+      {
+      if (cv == 0)
+            return;
+      cv->search(s);
+      }
+
+//---------------------------------------------------------
+//   endSearch
+//---------------------------------------------------------
+
+void MuseScore::endSearch()
+      {
+      _searchDialog->hide();
+      if (cv)
+            cv->setFocus();
+      }
+
 //---------------------------------------------------------
 //   showSearchDialog
 //---------------------------------------------------------

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -5261,17 +5261,22 @@ void ScoreView::search(const QString& s)
                   }
             else {
                   //search rehearsal marks
+                  QString ss = s.toLower();
+                  bool found = false;
                   for (Segment* seg = score()->firstSegment(); seg; seg = seg->next1(Segment::Type::ChordRest)) {
                         for (Element* e : seg->annotations()){
                               if (e->type() == Element::Type::REHEARSAL_MARK) {
                                     RehearsalMark* rm = static_cast<RehearsalMark*>(e);
-                                    QString rms = rm->text();
-                                    if (rms.contains(s)) {
+                                    QString rms = rm->text().toLower();
+                                    if (rms.startsWith(ss)) {
                                           gotoMeasure(seg->measure());
+                                          found = true;
                                           break;
                                           }
                                     }
                               }
+                        if (found)
+                              break;
                         }
                   }
             }