Copy annotations and hairpins when exploding/imploding staves #23787
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
miiizen
changed the title
miiizen
force-pushed
the
23767-explode-dynamics
branch
from
d97ae16
to
9bd670a
Compare
mike-spa
reviewed
Jul 29, 2024
src/engraving/dom/engravingitem.cpp
Outdated
Comment on lines
1323
to
1342
| const VoiceAssignment voiceAssignment = getProperty(Pid::VOICE_ASSIGNMENT).value<VoiceAssignment>(); | ||
| if (voiceAssignment == VoiceAssignment::CURRENT_VOICE_ONLY && track() == refTrack) { | ||
| return true; | ||
| } | ||
|
|
||
| if (voiceAssignment == VoiceAssignment::ALL_VOICE_IN_STAFF && track2staff(track()) == track2staff(refTrack)) { | ||
| return true; | ||
| } | ||
|
|
||
| const Part* elementPart = part(); | ||
| if (!elementPart) { | ||
| return false; | ||
| } | ||
|
|
||
| if (voiceAssignment == VoiceAssignment::ALL_VOICE_IN_INSTRUMENT && (elementPart->startTrack() <= refTrack | ||
| && elementPart->endTrack() - 1 >= refTrack)) { | ||
| return true; | ||
| } | ||
| return false; | ||
| } |
There was a problem hiding this comment.
This code is repeated identical in Spanner::elementAppliesToTrack in order to check for both track() and track2(). Here's a suggestion for how to improve it.
Move this bit of code into a protected static function, something like:
protected:
static bool elementAppliesToTrack(track_idx_t elementTrack, track_idx_t refTrack, VoiceAssignment voiceAssignment);
Then you can have:
bool EngravingItem::appliesToTrack(track_idx_t refTrack) const
{
if (!hasVoiceAssignmentProperties()) {
return refTrack == track();
}
return elementAppliesToTrack(track(), refTrack, voiceAssignment());
}
and the Spanner version as:
bool Spanner::appliesToTrack(track_idx_t refTrack) const
{
if (!hasVoiceAssignmentProperties()) {
return refTrack == track() || refTrack == track2();
}
return elementAppliesToTrack(track(), refTrack, voiceAssignment()) || elementAppliesToTrack(track2(), refTrack, voiceAssignment());
}
mike-spa
reviewed
Jul 29, 2024
src/engraving/dom/edit.cpp
Outdated
|
|
||
| EngravingItem* newAnnotation; | ||
| //does a linked clone to create just this element | ||
| //otherwise element will be add in every linked stave |
There was a problem hiding this comment.
I am a bit confused by this comment. Do I understand correctly that the cloneVoice function is used both for creating linked copies (as in parts) and non-linked copies (as in the explode command)? What do you mean by "does a linked clone to create just this element"?
There was a problem hiding this comment.
Yes, copied this from above. It's unclear, I'll correct it!
miiizen
force-pushed
the
23767-explode-dynamics
branch
from
9bd670a
to
7a836f3
Compare
oktophonie
approved these changes
Jul 29, 2024
mike-spa
approved these changes
Jul 29, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Resolves: #23767
This PR copies annotations (dynamics, text etc.) and hairpins when exploding and imploding staves. Where there are voice assignments (in the case of dynamics and hairpins), these are taken into account.
Screen.Recording.2024-07-26.at.17.13.55.mov