fix #3056: change the way MuseScore guess which notes to enter

musescore · Sep 5, 2013 · d96fbd5 · d96fbd5
1 parent 3a46158
commit d96fbd5
Show file tree

Hide file tree

Showing 6 changed files with 27 additions and 15 deletions.
diff --git a/libmscore/cmd.cpp b/libmscore/cmd.cpp
@@ -500,7 +500,6 @@ void Score::cmdAddInterval(int val, const QList<Note*>& nl)
             setLayoutAll(true);
 
             select(note, SELECT_SINGLE, 0);
-            _is.pitch = note->pitch();
             }
       moveToNextInputPos();
       endCmd();
@@ -1253,7 +1252,6 @@ void Score::upDown(bool up, UpDownMode mode)
                               }
                         break;
                   }
-            _is.pitch = newPitch;
 
             if ((oNote->pitch() != newPitch) || (oNote->tpc() != newTpc)) {
                   // remove accidental if present to make sure
@@ -2135,7 +2133,6 @@ void Score::cmd(const QAction* a)
                   Element* e = upAlt(el);
                   if (e) {
                         if (e->type() == Element::NOTE) {
-                              _is.pitch = static_cast<Note*>(e)->pitch();
                               _playNote = true;
                               }
                         select(e, SELECT_SINGLE, 0);
@@ -2149,7 +2146,6 @@ void Score::cmd(const QAction* a)
                   Element* e = downAlt(el);
                   if (e) {
                         if (e->type() == Element::NOTE) {
-                              _is.pitch = static_cast<Note*>(e)->pitch();
                               _playNote = true;
                               }
                         select(e, SELECT_SINGLE, 0);
@@ -2163,7 +2159,6 @@ void Score::cmd(const QAction* a)
                   Element* e = upAltCtrl(static_cast<Note*>(el));
                   if (e) {
                         if (e->type() == Element::NOTE) {
-                              _is.pitch = static_cast<Note*>(e)->pitch();
                               _playNote = true;
                               }
                         select(e, SELECT_SINGLE, 0);
@@ -2177,7 +2172,6 @@ void Score::cmd(const QAction* a)
                   Element* e = downAltCtrl(static_cast<Note*>(el));
                   if (e) {
                         if (e->type() == Element::NOTE) {
-                              _is.pitch = static_cast<Note*>(e)->pitch();
                               _playNote = true;
                               }
                         select(e, SELECT_SINGLE, 0);

diff --git a/libmscore/edit.cpp b/libmscore/edit.cpp
@@ -729,7 +729,6 @@ void Score::putNote(const Position& p, bool replace)
                   break;
             }
 
-      _is.pitch = nval.pitch;
       expandVoice();
       ChordRest* cr = _is.cr();
       bool addToChord = false;
@@ -828,8 +827,6 @@ void Score::repitchNote(const Position& p, bool replace)
       nval.pitch = step2pitch(step) + octave * 12 + acci;
       nval.tpc   = step2tpc(step % 7, acci);
 
-      _is.pitch = nval.pitch;
-
       Chord* chord;
       if (_is.cr()->type() == Element::REST) {
             undoRemoveElement(_is.cr());

diff --git a/libmscore/input.cpp b/libmscore/input.cpp
@@ -34,7 +34,6 @@ InputState::InputState() :
    _string(VISUAL_STRING_NONE),
    _repitchMode(false),
    rest(false),
-   pitch(72),
    noteType(NOTE_NORMAL),
    beamMode(BeamMode::AUTO),
    noteEntryMode(false),

diff --git a/libmscore/input.h b/libmscore/input.h
@@ -38,7 +38,6 @@ class InputState {
 
    public:
       bool rest;              // rest mode
-      int pitch;              // last pitch
       NoteType noteType;
       BeamMode beamMode;
       bool noteEntryMode;

diff --git a/libmscore/score.cpp b/libmscore/score.cpp
@@ -2703,7 +2703,6 @@ void Score::setInputState(Element* e)
             _is.setDuration(chord->durationType());
             _is.rest      = false;
             _is.setTrack(note->track());
-            _is.pitch     = note->pitch();
             _is.noteType  = note->noteType();
             _is.beamMode  = chord->beamMode();
             }

diff --git a/mscore/scoreview.cpp b/mscore/scoreview.cpp
@@ -4809,7 +4809,7 @@ void ScoreView::cmdAddPitch(int note, bool addFlag)
             return;
             }
       Drumset* ds = is.drumset();
-      int octave = is.pitch / 12;
+      int octave = 4;
       if (ds) {
             char note1 = "CDEFGAB"[note];
             int pitch = -1;
@@ -4829,9 +4829,33 @@ void ScoreView::cmdAddPitch(int note, bool addFlag)
             octave = pitch / 12;
             }
       else {
-            static const int tab[] = { 0, 2, 4, 5, 7, 9, 11 };
-            int delta = octave * 12 + tab[note] - is.pitch;
+            int curPitch = -1;
+            if(is.segment()) {
+                  Segment* seg = is.segment()->prev1(Segment::SegChordRest | Segment::SegClef);
+                  while(seg) {
+                        if(seg->segmentType() == Segment::SegChordRest) {
+                              Element* p = seg->element(is.track());
+                              if(p && p->type() == Element::CHORD) {
+                                    Chord* ch = static_cast<Chord*>(p);
+                                    curPitch = ch->downNote()->pitch();
+                                    break;
+                                    }
+                              }
+                        else if(seg->segmentType() == Segment::SegClef) {
+                              Element* p = seg->element( (is.track() / VOICES) * VOICES); // clef on voice 1
+                              if(p && p->type() == Element::CLEF) {
+                                    Clef* clef = static_cast<Clef*>(p);
+                                    curPitch = line2pitch(4, clef->clefType(), 0); // C 72 for treble clef
+                                    break;
+                                    }
+                              }
+                        seg = seg->prev1(Segment::SegChordRest | Segment::SegClef);
+                        }
+                        octave = curPitch / 12;
+                  }
 
+            static const int tab[] = { 0, 2, 4, 5, 7, 9, 11 };
+            int delta = octave * 12 + tab[note] - curPitch;
             if (delta > 6)
                    --octave;
             else if (delta < -6)