LoweBowe/MuseScore
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #4979 from mattmcclinch/288528-change-pitch

Browse source 
fix #288528: After you change the pitch of a note that's tied, both tied notes end up selected.
This commit is contained in:
anatoly-os 2019-05-20 16:23:45 +03:00 committed by GitHub
commit d103b8f417
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
libmscore/cmd.cpp
View file

@ -1347,7 +1347,7 @@ static void setTpc(Note* oNote, int tpc, int& newTpc1, int& newTpc2)
/// Increment/decrement pitch of note by one or by an octave.
//---------------------------------------------------------
void Score::upDown(bool up, UpDownMode mode, bool updateSelection)
void Score::upDown(bool up, UpDownMode mode)
{
QList<Note*> el = selection().uniqueNotes();
@ -1515,12 +1515,6 @@ void Score::upDown(bool up, UpDownMode mode, bool updateSelection)
// play new note with velocity 80 for 0.3 sec:
setPlayNote(true);
}
if (updateSelection) {
_selection.clear();
for (Note* note : el)
_selection.add(note);
}
}
//---------------------------------------------------------
@ -1528,15 +1522,15 @@ void Score::upDown(bool up, UpDownMode mode, bool updateSelection)
/// Add the delta to the pitch of note.
//---------------------------------------------------------
void Score::upDownDelta(int pitchDelta, bool updateSelection)
void Score::upDownDelta(int pitchDelta)
{
while (pitchDelta > 0) {
upDown(true, UpDownMode::CHROMATIC, updateSelection);
upDown(true, UpDownMode::CHROMATIC);
pitchDelta--;
}
while (pitchDelta < 0) {
upDown(false, UpDownMode::CHROMATIC, updateSelection);
upDown(false, UpDownMode::CHROMATIC);
pitchDelta++;
}
}

4
libmscore/score.h
View file

@ -667,8 +667,8 @@ class Score : public QObject, public ScoreElement {
ChordRest* addClone(ChordRest* cr, const Fraction& tick, const TDuration& d);
Rest* setRest(const Fraction& tick, int track, const Fraction&, bool useDots, Tuplet* tuplet, bool useFullMeasureRest = true);
void upDown(bool up, UpDownMode, bool updateSelection = true);
void upDownDelta(int pitchDelta, bool updateSelection);
void upDown(bool up, UpDownMode);
void upDownDelta(int pitchDelta);
ChordRest* searchNote(const Fraction& tick, int track) const;
// undo/redo ops

2
mscore/pianoview.cpp
View file

@ -826,7 +826,7 @@ void PianoView::mouseMoveEvent(QMouseEvent* event)
}
score->startCmd();
score->upDownDelta(pitchDelta, false);
score->upDownDelta(pitchDelta);
score->endCmd();
inProgressUndoEvent = true;