[MU4] fix MU3 issue #323402, accidentals not shown as expected for altered unisons #8772
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
wizofaus
force-pushed
the
show_accidentals_altered_unisons
branch
from
191c64f
to
114e79a
Compare
wizofaus
commented
Aug 1, 2021
src/engraving/libmscore/note.cpp
Outdated
| @@ -2354,6 +2363,10 @@ void Note::updateAccidental(AccidentalState* as) | |||
| } else if (acci == AccidentalType::NONE) { | |||
| acci = AccidentalType::NATURAL; | |||
| } | |||
| } else if (chordHasAnotherAccidentalForSameNote(this)) { | |||
There was a problem hiding this comment.
potentially this condition could be just be added to the if above, but hard to be confident that won't have other consequences
wizofaus
commented
Aug 1, 2021
| Measure* m = score->firstMeasure(); | ||
| Chord* c = m->findChord(Fraction(0, 1), 0); | ||
| QVERIFY(c->downNote()->accidental() && c->downNote()->accidental()->accidentalType() == Ms::AccidentalType::FLAT); | ||
| QVERIFY(c->upNote()->accidental() && c->upNote()->accidental()->accidentalType() == Ms::AccidentalType::NATURAL); |
There was a problem hiding this comment.
Would have preferred to use QCOMPARE however this is crashing for me using MSVC debug C runtime, when it tries to delete the strings returned by QTest::toString( ). No idea why, it all looks fine stepping through it.
wizofaus
changed the title
wizofaus
force-pushed
the
show_accidentals_altered_unisons
branch
from
114e79a
to
fb2db95
Compare
wizofaus
commented
Aug 2, 2021
| int relLine = absStep(note->tpc(), note->epitch()); | ||
| return std::find_if(chordNotes.begin(), chordNotes.end(), [note, accVal, relLine](Note* n) { | ||
| return n != note && !n->hidden() && absStep(n->tpc(), n->epitch()) == relLine && tpc2alter(n->tpc()) != accVal; | ||
| }) != chordNotes.end(); |
There was a problem hiding this comment.
i.e. look for a note on the same A-G step (including octave), but that would require a different accidental.
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 2, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 3, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 3, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 3, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 7, 2021
|
Does this need somebody else to review/approve @igorkorsukov |
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 13, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 13, 2021
igorkorsukov
approved these changes
Aug 16, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 19, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 19, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Aug 30, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 1, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 2, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 9, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 10, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 23, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 26, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Sep 29, 2021
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
May 12, 2022
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Mar 5, 2023
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: https://musescore.org/en/node/323402
Altered unisons where the same note occurs twice in one chord but with different accidentals need to ensure that the accidentals for both notes are always correctly shown (currently they appear and disappear somewhat randomly)