Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/engraving/dom/note.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1767,7 +1767,7 @@ EngravingItem* Note::drop(EditData& data)
return e;

case ElementType::ACCIDENTAL:
score()->changeAccidental(this, toAccidental(e)->accidentalType());
score()->changeAccidental(this, toAccidental(e)->accidentalType(), toAccidental(e)->bracket());
break;

case ElementType::BEND:
Expand Down
2 changes: 1 addition & 1 deletion src/engraving/dom/score.h
Original file line number Diff line number Diff line change
Expand Up @@ -558,7 +558,7 @@ class Score : public EngravingObject, public muse::Contextable
void toggleOrnament(SymId);
void toggleAccidental(AccidentalType);
void changeAccidental(AccidentalType);
void changeAccidental(Note* oNote, AccidentalType);
void changeAccidental(Note* oNote, AccidentalType, std::optional<AccidentalBracket> = std::nullopt);

void addElement(EngravingItem*);
void doUndoAddElement(EngravingItem*);
Expand Down
11 changes: 10 additions & 1 deletion src/engraving/editing/cmd.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -2346,7 +2346,7 @@ static void changeAccidental2(Note* n, int pitch, int tpc)
/// note \a note.
//---------------------------------------------------------

void Score::changeAccidental(Note* note, AccidentalType accidental)
void Score::changeAccidental(Note* note, AccidentalType accidental, std::optional<AccidentalBracket> bracket)
{
Chord* chord = note ? note->chord() : nullptr;
if (!chord) {
Expand Down Expand Up @@ -2405,6 +2405,12 @@ void Score::changeAccidental(Note* note, AccidentalType accidental)
|| Accidental::isMicrotonal(accidental)) {
forceAdd = true;
}
// since Note::updateAccidental doesn't have
// enough context to pick the correct parenthesis
// the accidental needs to be added here
else if (bracket.has_value()) {
forceAdd = true;
}

for (EngravingObject* se : note->linkList()) {
Note* ln = toNote(se);
Expand All @@ -2427,6 +2433,9 @@ void Score::changeAccidental(Note* note, AccidentalType accidental)
Accidental* a1 = Factory::createAccidental(ln);
a1->setParent(ln);
a1->setAccidentalType(accidental);
if (bracket.has_value()) {
a1->setBracket(bracket.value());
}
a1->setRole(AccidentalRole::USER);
lns->undoAddElement(a1);
} else if (a && Accidental::isMicrotonal(a->accidentalType())) {
Expand Down
21 changes: 21 additions & 0 deletions src/engraving/tests/note_tests.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -547,3 +547,24 @@ TEST_F(Engraving_NoteTests, LongNoteAfterShort_183746)
Fraction breveTicks = TDuration(DurationType::V_BREVE).ticks();
EXPECT_TRUE(totalTicks == breveTicks); // total duration same as a breve
}

//---------------------------------------------------------
/// changeAccidentalBracket
/// test changeAccidental with bracket argument
//---------------------------------------------------------

TEST_F(Engraving_NoteTests, changeAccidentalWithBracket)
{
MasterScore* score = ScoreRW::readScore(NOTE_DATA_DIR + u"altered-unison.mscx");
Measure* m = score->firstMeasure();
Chord* c = m->findChord(Fraction(0, 1), 0);
Note* note = c->upNote();

score->startCmd(TranslatableString::untranslatable("Engraving note tests"));
score->changeAccidental(note, AccidentalType::SHARP, AccidentalBracket::BRACKET);
score->endCmd();

EXPECT_TRUE(note->accidental());
EXPECT_EQ(note->accidental()->accidentalType(), AccidentalType::SHARP);
EXPECT_EQ(note->accidental()->bracket(), AccidentalBracket::BRACKET);
}
Loading