Porting a bunch of old musicXML fixes #19972
Merged
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
Jojo-Schmitz
reviewed
Nov 8, 2023
| @@ -61,6 +62,7 @@ class mxmlNoteDuration | |||
| Fraction _dura; | |||
| TDuration _normalType; | |||
| Fraction _timeMod { 1, 1 }; // default to no time modification | |||
| MusicXMLParserPass1* _pass1; | |||
There was a problem hiding this comment.
better swap this with the next to avoid a warning reg. wrong order of initialisation
Jojo-Schmitz
reviewed
Nov 8, 2023
| @@ -4755,7 +5236,8 @@ Note* MusicXMLParserPass2::note(const QString& partId, | |||
| int msTrack = 0; | |||
| int msVoice = 0; | |||
|
|
|||
| if (!_pass1.determineStaffMoveVoice(partId, staff, voice, msMove, msTrack, msVoice)) { | |||
| int voiceInt = _pass1.voiceToInt(voice); | |||
| if (!_pass1.determineStaffMoveVoice(partId, staff, voiceInt, msMove, msTrack, msVoice)) { | |||
| _logger->logDebugInfo(QString("could not map staff %1 voice '%2'").arg(staff + 1).arg(voice), &_e); | |||
There was a problem hiding this comment.
Maybe using voiceInt here too?
Jojo-Schmitz
reviewed
Nov 8, 2023
| @@ -707,6 +752,9 @@ TEST_F(Musicxml_Tests, multiMeasureRest4) { | |||
| TEST_F(Musicxml_Tests, multipleNotations) { | |||
| mxmlIoTestRef("testMultipleNotations"); | |||
| } | |||
| TEST_F(Musicxml_Tests, negativeOffset) { | |||
| mxmlImportTestRef("testNegativeOffset"); | |||
| } | |||
There was a problem hiding this comment.
wrong aphabethical order...
Jojo-Schmitz
reviewed
Nov 8, 2023
| TEST_F(Musicxml_Tests, overlappingSpanners) { | ||
| mxmlIoTest("testOverlappingSpanners"); | ||
| } | ||
| TEST_F(Musicxml_Tests, partNames) { | ||
| mxmlImportTestRef("testPartNames"); | ||
| } |
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 9, 2023
Backport of musescore#19972, those parts that hadn't been ported already (much) ealier.
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 9, 2023
Backport of musescore#19972, those parts that hadn't been ported already (much) ealier.
Jojo-Schmitz
added a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 9, 2023
Backport of musescore#19972, those parts that hadn't been ported already (much) ealier.
mike-spa
force-pushed
the
musicXMLimprovements
branch
from
712ad23
to
c94f584
Compare
| auto firstMeasure = _score->measures()->first(); | ||
| VBox* vbox = firstMeasure->isVBox() ? toVBox(firstMeasure) : MusicXMLParserPass1::createAndAddVBoxForCreditWords(_score); | ||
| vbox->add(t); | ||
| } else if (_wordsText != "" || _rehearsalText != "" || _metroText != "") { |
There was a problem hiding this comment.
Seems to collide with #8678, which , as far as I can tell, got merged into 3.6.2_backend later
33 tasks
| @@ -175,6 +177,12 @@ class MusicXMLParserPass1 | |||
| int octaveShift(const QString& id, const staff_idx_t staff, const Fraction f) const; | |||
| const CreditWordsList& credits() const { return _credits; } | |||
| bool hasBeamingInfo() const { return _hasBeamingInfo; } | |||
| bool isVocalStaff(const QString& id) const { return _parts[id].isVocalStaff(); } | |||
| static VBox* createAndAddVBoxForCreditWords(Score* const score, const int miny = 0, const int maxy = 75); | |||
| const int maxDiff() { return _maxDiff; } | |||
There was a problem hiding this comment.
not rather int maxDiff() const { return _maxDiff; }? Otherwise there's a warning "'const' type qualifier on return type has no effect"
mike-spa
force-pushed
the
musicXMLimprovements
branch
3 times, most recently
from
a779867
to
2bf2a0c
Compare
| @@ -3316,7 +3316,7 @@ void MusicXMLParserDirection::handleNmiCmi(Measure* measure, const int track, co | |||
| ha->setTrack(track); | |||
| MusicXMLDelayedDirectionElement* delayedDirection = new MusicXMLDelayedDirectionElement(totalY(), ha, track, "above", measure, tick); | |||
| delayedDirections.push_back(delayedDirection); | |||
| _wordsText.replace("NmiCmi", ""); | |||
| _wordsText.replace("NmiCmi", "N.C."); | |||
There was a problem hiding this comment.
No need for such a staff text, as the "N.C." already gets set as a chord symbol
You'd see the issue if and when including the units tests from aca2536
7a02054 correction
mike-spa
force-pushed
the
musicXMLimprovements
branch
from
0c499e5
to
bd7c5b3
Compare
oktophonie
approved these changes
Nov 16, 2023
RomanPudashkin
approved these changes
Nov 16, 2023
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 16, 2023
Backport of musescore#19972, commit 38
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 16, 2023
Backport of musescore#19972, commit 38
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Nov 16, 2023
Backport of musescore#19972, commit 38
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Mar 18, 2024
Backport of one forgotten commit from musescore#19972
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Mar 18, 2024
Backport of one forgotten commit from musescore#19972
Jojo-Schmitz
pushed a commit
to Jojo-Schmitz/MuseScore
that referenced
this pull request
Apr 9, 2024
Backport of one forgotten commit from musescore#19972
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.
Each commit here refers to porting an old commit (linked in each description).