Skip to content

Fix #24727: Implode honours grace note transposition #31255

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
+24 −19
Open

Fix #24727: Implode honours grace note transposition #31255

Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
43 changes: 24 additions & 19 deletions src/engraving/editing/edit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5208,14 +5208,11 @@ void Score::cloneVoice(track_idx_t strack, track_idx_t dtrack, Segment* sf, cons
}
}

if (oe->isChord()) {
Chord* och = toChord(ocr);
Chord* nch = toChord(ncr);

size_t n = och->notes().size();
auto cloneChord = [&](Chord* oldChord, Chord* newChord) {
size_t n = oldChord->notes().size();
for (size_t i = 0; i < n; ++i) {
Note* on = och->notes().at(i);
Note* nn = nch->notes().at(i);
Note* on = oldChord->notes().at(i);
Note* nn = newChord->notes().at(i);
staff_idx_t idx = track2staff(dtrack);
Fraction tick = oseg->tick();
Interval v = staff(idx) ? staff(idx)->transpose(tick) : Interval();
Expand Down Expand Up @@ -5270,32 +5267,40 @@ void Score::cloneVoice(track_idx_t strack, track_idx_t dtrack, Segment* sf, cons
}
}
// two note tremolo
if (och->tremoloTwoChord()) {
if (och == och->tremoloTwoChord()->chord1()) {
if (oldChord->tremoloTwoChord()) {
if (oldChord == oldChord->tremoloTwoChord()->chord1()) {
if (tremolo) {
LOGD("unconnected two note tremolo");
}
if (link) {
tremolo = item_cast<TremoloTwoChord*>(och->tremoloTwoChord()->linkedClone());
tremolo = item_cast<TremoloTwoChord*>(oldChord->tremoloTwoChord()->linkedClone());
} else {
tremolo = item_cast<TremoloTwoChord*>(och->tremoloTwoChord()->clone());
tremolo = item_cast<TremoloTwoChord*>(oldChord->tremoloTwoChord()->clone());
}
tremolo->setScore(nch->score());
tremolo->setParent(nch);
tremolo->setTrack(nch->track());
tremolo->setChords(nch, nullptr);
nch->setTremoloTwoChord(tremolo);
} else if (och == och->tremoloTwoChord()->chord2()) {
tremolo->setScore(newChord->score());
tremolo->setParent(newChord);
tremolo->setTrack(newChord->track());
tremolo->setChords(newChord, nullptr);
newChord->setTremoloTwoChord(tremolo);
} else if (oldChord == oldChord->tremoloTwoChord()->chord2()) {
if (!tremolo) {
LOGD("first note for two note tremolo missing");
} else {
tremolo->setChords(tremolo->chord1(), nch);
nch->setTremoloTwoChord(tremolo);
tremolo->setChords(tremolo->chord1(), newChord);
newChord->setTremoloTwoChord(tremolo);
}
} else {
LOGD("inconsistent two note tremolo");
}
}
};
if (oe->isChord()) {
cloneChord(toChord(ocr), toChord(ncr));
for (size_t i = 0; i < toChord(ocr)->graceNotes().size(); ++i) {
Chord* ogc = toChord(ocr)->graceNotes().at(i);
Chord* ngc = toChord(ncr)->graceNotes().at(i);
cloneChord(ogc, ngc);
}
}

// Add element
Expand Down
Loading