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

Merge pull request #984 from MarcSabatella/25285-courtesy-link

Browse source 
fix #25285: add&remove courtesy accidentals for links
This commit is contained in:
Nicolas Froment 2014-06-18 08:44:48 +02:00
commit 9f8b090e04
1 changed files with 49 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

73
libmscore/cmd.cpp
View file

@ -1444,34 +1444,59 @@ void Score::changeAccidental(Note* note, Accidental::AccidentalType accidental)
pitch += note->transposition();
int tpc = step2tpc(step, acc);
if (accidental == Accidental::AccidentalType::NONE) {
//
// delete accidentals
//
// check if there's accidentals left, previously set as
// precautionary accidentals
Accidental* a = note->accidental();
if (a)
undoRemoveElement(note->accidental());
}
else if (acc == acc2 || accidental > Accidental::AccidentalType::NATURAL) {
//
// precautionary or microtonal accidental
// either way, we display it unconditionally
//
Accidental* a = new Accidental(this);
a->setParent(note);
a->setAccidentalType(accidental);
a->setRole(Accidental::AccidentalRole::USER);
undoAddElement(a);
}
bool forceRemove = false;
bool forceAdd = false;
// delete accidental
// both for this note and for any linked notes
if (accidental == Accidental::AccidentalType::NONE)
forceRemove = true;
// precautionary or microtonal accidental
// either way, we display it unconditionally
// both for this note and for any linked notes
else if (acc == acc2 || accidental > Accidental::AccidentalType::NATURAL)
forceAdd = true;
if (note->links()) {
for (Element* e : *note->links())
changeAccidental2(static_cast<Note*>(e), pitch, tpc);
for (Element* e : *note->links()) {
Note* ln = static_cast<Note*>(e);
if (ln->concertPitch() != note->concertPitch())
continue;
Score* lns = ln->score();
if (forceRemove) {
Accidental* a = ln->accidental();
if (a)
lns->undoRemoveElement(a);
}
else if (forceAdd) {
Accidental* a = new Accidental(lns);
a->setParent(ln);
a->setAccidentalType(accidental);
a->setRole(Accidental::AccidentalRole::USER);
lns->undoAddElement(a);
}
changeAccidental2(ln, pitch, tpc);
}
}
else
else {
if (forceRemove) {
Accidental* a = note->accidental();
if (a)
undoRemoveElement(a);
}
else if (forceAdd) {
Accidental* a = new Accidental(this);
a->setParent(note);
a->setAccidentalType(accidental);
a->setRole(Accidental::AccidentalRole::USER);
undoAddElement(a);
}
changeAccidental2(note, pitch, tpc);
}
}
//---------------------------------------------------------