Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

InstrumentOrdering updates #6880

Merged
merged 2 commits into from
Nov 17, 2020
Merged

InstrumentOrdering updates #6880

merged 2 commits into from
Nov 17, 2020

Conversation

njvdberg
Copy link
Contributor

This PR solves a few issues found in the score ordering:

  • In the InstrumentsWidget, the field Ordering was initial empty. This causes a crash later on. Now the field will show the first score order, which is Orchestra

  • In the original PR, trackName was used for score ordering. However, this can be translated so no instrument could be found for ordering. The result was a crash. Now the instrumentId from instruments.xml is used, and now also stored in the score file. This makes score ordering independent from any translation or rename of instrument used. As a consequence several reference file are updated to include this instrumentId.

  • For backwards compatibility, during the load of a score file, every instrument is checked for instrumentId. If this instrumentId is not found, MusicXMLId is used to find the instrumentId.

  • I signed CLA

  • I made sure the code in the PR follows the coding rules

  • I made sure the code compiles on my machine

  • I made sure there are no unnecessary changes in the code

  • I made sure the title of the PR reflects the core meaning of the issue you are solving

  • I made sure the commit message(s) contain a description and answer the question "Why do those changes fix that particular issue?" or "Why are those changes really necessary as improvements?"

  • I made sure the commit message title starts with "fix #424242:" if there is a related issue

  • I created the test (mtest, vtest, script test) to verify the changes I made

…e trackName can be translated end therefor not be found.

If the score file doesn't contain a instrumentId for an instrument, use the MusicXML to find the instrumentId for that If no instrumentId is found and fall back on famly <unsorted>.
@vpereverzev vpereverzev merged commit 33b2794 into musescore:3.x Nov 17, 2020
igorkorsukov added a commit to igorkorsukov/MuseScore that referenced this pull request Feb 3, 2021
@njvdberg njvdberg deleted the InstrumentId branch March 10, 2021 12:47
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants