The #GreatAccidentalsReform #21042
The #GreatAccidentalsReform #21042
Conversation
|
Wow, quite the project! I look forward to checking out the results. I wanted to find my old test file based on Daniel Spreadbury's blog article https://blog.dorico.com/2014/03/development-diary-part-six, but unfortunately I can't seem to find the MSCZ file itself. I did find the results of one of my other tests from back then, and I'll be curious to compare:
|
|
Disclaimer: don't get overexcited over any particular details. This is just me not resisting the urge to use the new cutouts and trying out stuff. |
|
LOVING THIS |
|
Fabulous progress @mike-spa! |
igorkorsukov
force-pushed
the
master
branch
6 times, most recently
from
fa1f8d3 to
525a11a
Compare
mike-spa
force-pushed
the
accidentalsReform
branch
from
dd89567 to
63f35fc
Compare
mike-spa
force-pushed
the
accidentalsReform
branch
2 times, most recently
from
642a240 to
5777d2e
Compare
mike-spa
force-pushed
the
accidentalsReform
branch
from
5777d2e to
7bfe8d1
Compare
mike-spa
force-pushed
the
accidentalsReform
branch
from
7bfe8d1 to
1ceb6a0
Compare
mike-spa
force-pushed
the
accidentalsReform
branch
2 times, most recently
from
d5c2f0e to
ec94049
Compare
mike-spa
force-pushed
the
accidentalsReform
branch
2 times, most recently
from
ecee97a to
e1b8bb6
Compare
|
@RomanPudashkin done! 👍 |
| { | ||
| std::vector<Accidental*> accidentals; | ||
|
|
||
| for (Chord* chord : chords) { |
There was a problem hiding this comment.
Please use const with pointers unless you are going to change their value
| if (!acc) { | ||
| continue; | ||
| } | ||
| acc->setPos(0.0, 0.0); |
There was a problem hiding this comment.
This is not ideal... This function not only collects accidentals but also changes some properties. Ideally, it should have only one responsibility (find and return accidentals)
| verticallyAlignAccidentals(ctx); | ||
| } | ||
|
|
||
| void AccidentalsLayout::findOctaves(AccidentalsLayoutContext& ctx) |
There was a problem hiding this comment.
Since this code will be called quite often, it is probably better to combine this function with findSeconds. This way, we will reduce the complexity of the algorithm
| firstGroup.push_back(ctx.allAccidentals.front()); | ||
| ctx.accidentalSubChords.push_back(firstGroup); | ||
|
|
||
| for (int i = 1; i < ctx.allAccidentals.size(); ++i) { |
There was a problem hiding this comment.
This will generate a warning as size() returns size_t
| TLayout::layoutAccidental(acc, acc->mutldata(), ctx.conf()); | ||
| } | ||
|
|
||
| AccidentalsLayoutContext accidentalsLayoutContext(allAccidentals, chords); |
There was a problem hiding this comment.
It's better to use std::move with allAccidentals to avoid creating a copy (the AccidentalsLayoutContext constructor also needs to be adjusted)
| void AccidentalsLayout::mergeSubGroupsWithOctavesAcross(AccidentalsLayoutContext& ctx) | ||
| { | ||
| bool foundOctave = false; | ||
| do { |
There was a problem hiding this comment.
I'm not sure what's going on in this function, but it's very complex (5 nested loops + lots of operations on std::vector). Is there any way to simplify/optimize it?
There was a problem hiding this comment.
I've moved out some code to make it more readable, but unfortunately I can't think of any way to simplify this. These are very gnarly engraving requirements resulting in very gnarly code logic. Luckily this function (and the next one that you pointed out) is used rarely so it shouldn't impact performance
| applyOrderingOffsets(accidentals); | ||
| } | ||
|
|
||
| std::vector<std::vector<Accidental*> > AccidentalsLayout::splitIntoPriorityGroups |
There was a problem hiding this comment.
It's better to add an alias for this type
| void AccidentalsLayout::moveOctavesToSecondGroup(std::vector<std::vector<Accidental*> >& subGroups) | ||
| { | ||
| std::vector<Accidental*>& firstGroup = subGroups[0]; | ||
| std::vector<Accidental*>& secondGroup = subGroups[1]; |
There was a problem hiding this comment.
It looks like std::array might be a better type for subGroups
There was a problem hiding this comment.
This is one particular case (with conditions defined by the caller), but in general subGroups may have different sizes
There was a problem hiding this comment.
worth adding this
IF_ASSERT_FAILED(subGroups.size() == 2) {
return;
}
| return 0.0; | ||
| } | ||
|
|
||
| double AccidentalsLayout::computePadding(Accidental* acc, const EngravingItem* chordElement, AccidentalsLayoutContext& ctx) |
There was a problem hiding this comment.
const AccidentalsLayoutContext&
| AccidentalType accType = acc->accidentalType(); | ||
| if (chordItem->isLedgerLine() && (accType == AccidentalType::NATURAL || accType == AccidentalType::SHARP)) { | ||
| if (chordItem->y() > accShape.top() && chordItem->y() < accShape.bottom()) { | ||
| return accShape.right() - chordElement.left() + 0.1 * ctx.spatium(); |
| for (int j = 0; j < thisGroup.size(); ++j) { | ||
| Accidental* acc1 = thisGroup[j]; | ||
| for (Accidental* secondAcc : acc1->ldata()->seconds.value()) { | ||
| if (muse::remove(nextGroup, secondAcc)) { |
There was a problem hiding this comment.
same question. remove() isn't very efficient with std::vector
mike-spa
force-pushed
the
accidentalsReform
branch
2 times, most recently
from
adc9a8a to
6e0f341
Compare
|
@RomanPudashkin done! 👍 |
| TLayout::layoutAccidental(acc, acc->mutldata(), ctx.conf()); | ||
| } | ||
|
|
||
| AccidentalsLayoutContext accidentalsLayoutContext(std::move(allAccidentals), std::move(chords)); |
There was a problem hiding this comment.
std::move(chords) - this has no effect as chords is const std::vector<Chord*>& :)
| return subGroups; | ||
| } | ||
|
|
||
| AccidentalGroups AccidentalsLayout::groupAccidentalsByNoteXPos(std::vector<Accidental*>& accidentals) |
There was a problem hiding this comment.
This vector should be const
mike-spa
force-pushed
the
accidentalsReform
branch
from
6e0f341 to
f27403f
Compare
mike-spa
force-pushed
the
accidentalsReform
branch
from
f27403f to
f074b44
Compare
6 participants
Resolves: #9302
A complete rewrite of the accidental placement algorithms, making good use of the recently introduced accidental cutouts. Basically see the vtests.