implementation of next/prev track

move up and down by track, stopping only at tracks that have content at or before the cursor position within the current measure
musescore · Aug 2, 2013 · d9d6472 · d9d6472
1 parent 1ae7471
commit d9d6472
Show file tree

Hide file tree

Showing 3 changed files with 88 additions and 5 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -1795,13 +1795,23 @@ Element* Score::move(const QString& cmd)
                   moveInputPos(crc->segment());
                   }
             }
-      else if (cmd == "next-track")
-            el = downStaff(cr);
-      else if (cmd == "prev-track")
-            el = upStaff(cr);
+      else if (cmd == "next-track") {
+            el = nextTrack(cr);
+            if (noteEntryMode() && el && (el->type() == Element::CHORD || el->type() == Element::REST)){
+                  ChordRest* crc = static_cast<ChordRest*>(el);
+                  moveInputPos(crc->segment());
+                  }
+            }
+      else if (cmd == "prev-track") {
+            el = prevTrack(cr);
+            if (noteEntryMode() && el && (el->type() == Element::CHORD || el->type() == Element::REST)){
+                  ChordRest* crc = static_cast<ChordRest*>(el);
+                  moveInputPos(crc->segment());
+                  }
+            }
       if (el) {
             if (el->type() == Element::CHORD)
-                  el = static_cast<Chord*>(el)->downNote();
+                  el = static_cast<Chord*>(el)->upNote();       // originally downNote
             _playNote = true;
             select(el, SELECT_SINGLE, 0);
             }

diff --git a/libmscore/navigate.cpp b/libmscore/navigate.cpp
@@ -269,6 +269,77 @@ ChordRest* Score::downStaff(ChordRest* cr)
       return 0;
       }
 
+//---------------------------------------------------------
+//   nextTrack
+//    returns note at or just previous to current (cr) position
+//    in next non-empty track for this measure
+//    that contains such an element
+//---------------------------------------------------------
+
+ChordRest* Score::nextTrack(ChordRest* cr)
+      {
+      if (!cr)
+            return 0;
+
+      Element* el = 0;
+      Measure* measure = cr->measure();
+      int track = cr->track();
+      int tracks = nstaves() * VOICES;
+
+      while (!el) {
+            // find next non-empty track
+            while (++track < tracks){
+                  if (measure->hasVoice(track))
+                        break;
+                  }
+            // no more tracks, return original element
+            if (track == tracks)
+                  return cr;
+            // find element at same or previous segment within this track
+            for (Segment* segment = cr->segment(); segment != 0; segment = segment->prev(Segment::SegChordRest)) {
+                  el = segment->element(track);
+                  if (el)
+                        break;
+                  }
+            }
+      return static_cast<ChordRest*>(el);
+      }
+
+//---------------------------------------------------------
+//   prevTrack
+//    returns ChordRest at or just previous to current (cr) position
+//    in previous non-empty track for this measure
+//    that contains such an element
+//---------------------------------------------------------
+
+ChordRest* Score::prevTrack(ChordRest* cr)
+      {
+      if (!cr)
+            return 0;
+
+      Element* el = 0;
+      Measure* measure = cr->measure();
+      int track = cr->track();
+
+      while (!el) {
+            // find next non-empty track
+            while (--track >= 0){
+                  if (measure->hasVoice(track))
+                        break;
+                  }
+            // no more tracks, return original element
+            if (track < 0)
+                  return cr;
+            // find element at same or previous segment within this track
+            for (Segment* segment = cr->segment(); segment != 0; segment = segment->prev(Segment::SegChordRest)) {
+                  el = segment->element(track);
+                  if (el)
+                        break;
+                  }
+            }
+      return static_cast<ChordRest*>(el);
+      }
+
 //---------------------------------------------------------
 //   nextMeasure
 //---------------------------------------------------------

diff --git a/libmscore/score.h b/libmscore/score.h
@@ -369,6 +369,8 @@ class Score : public QObject {
       Note* downAltCtrl(Note*) const;
       ChordRest* upStaff(ChordRest* cr);
       ChordRest* downStaff(ChordRest* cr);
+      ChordRest* nextTrack(ChordRest* cr);
+      ChordRest* prevTrack(ChordRest* cr);
       void moveUp(Chord*);
       void moveDown(Chord*);