BeamBase, Beam and TremoloTwoChord refactor #24820
Open
+170
−276
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
src/engraving/dom/beambase.h
Outdated
Comment on lines
98
to
99
| void setDirection(DirectionV val) { m_direction = val; } | ||
| virtual void setBeamDirection(DirectionV v) = 0; |
There was a problem hiding this comment.
This combination of methods looks potentially confusing. I'd rename setDirection to doSetDirection and make it protected; then rename setBeamDirection to setDirection.
There was a problem hiding this comment.
I've changed the names but doSetDirection needs to remain public for its use in TremoloLayout::layoutTwoNotesTremolo
Comment on lines
+40
to
+41
| // idx 0 - DirectionV::AUTO or DirectionV::DOWN | ||
| // 1 - DirectionV::UP |
There was a problem hiding this comment.
Aside: I've always found "auto/down" vs "up" a strange classification and never understood why we'd ever treat "auto" as "down". But that's probably for another day.
cbjeukendrup
approved these changes
Sep 24, 2024
| @@ -45,6 +45,7 @@ class TremoloLayout | |||
| private: | |||
| static void layoutOneNoteTremolo(TremoloSingleChord* item, const LayoutContext& ctx, double x, double y, double h, double spatium); | |||
| static void layoutTwoNotesTremolo(TremoloTwoChord* item, const LayoutContext& ctx, double x, double y, double h, double spatium); | |||
| static void calcIsUp(TremoloTwoChord* item); | |||
There was a problem hiding this comment.
Looks like there is no implementation for this
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.
I spotted a lot of duplicated code between
BeamandTremoloTwoChord. I've unified this inBeamBase. This is mostly completely straightforward, with the exception ofclearBeamSegmentsandsetBeamDirectionwhich need overriden methods to deal with the different numbers of chords expected on each beam.It also looks like there's some leftover dead code from when two note and one note tremolos were a single class. I haven't tackled that in this PR, but we can slim the
TremoloTwoChordclass down even further in future.