[MU4] Preparation ScoreOrdering: part names in instruments form #8099

njvdberg · 2021-05-13T18:43:32Z

This PR is the first of a number of PR's required to

implement score ordering.
solve several issues with Parts and Excerpts
independent sorting of staves/parts in both main score and excepts.

The changes in this PR are:

-1 Replace MusicXMLid as an instrument id by the id as given in instruments.xml
This solves the issue an Oboe suddenly becomes a Baroque Oboe when the instruments form is opened again. The reason for this name change is MusicxXMLid isn't unique, several instrument share the same MusicXMLid. Both Oboe and Baroque Oboe share the same MusicXMLid, wind.reed.oboe but there also 3 Cornets, 4 Bariton Horns and even 10 Horns share the same id. This similar to PR #7995 but since it was required here too it is include in this PR and PR #7995 is closed.

-2 Your score in instrument form now shows Parts rather than Instruments
In the list under Your score, "Instruments" should refer to Parts, not Instruments. Please note Part is a class as used internally, not "Part" as seen on the UI, which is actually an Excerpt. And to complicate things even more, the word "Instrument" on the UI sometimes refers to a Part-class, sometime to an Instrument-class. The column Your score actually show the Parts for an Instrument.
By this change 2 issues are solved

When changing the part name Your score now shows this part name.
Without this PR, deleting in instrument in a part with an instrument change removes the wrong instruments. E.g. in a part starting with an Alto Saxophone, switching to Clarinet, switching to Tenor Saxophone and back to Alto Saxophone, removes all instrument changes!
With this PR the Part is removed, what actually is supposed to happen. PR [MU4] Show part name in instrument form instead of instrument name. #8048 is partly doing the same but this PR is more elaborated and replaces PR [MU4] Show part name in instrument form instead of instrument name. #8048.

-3 Soloist function implemented
When a part is made Soloist the part is made soloists. The form now also reflect the actual status of the part, soloist not no soloist. This is first step to implementing score ordering.

-4 Make soloist button moved
Original the Make soloist button was in the header of the part list under Your score. To make more space for the score order name is was decided to move this button to the instrument line. For the discussion, see the discussion with @Tantacrul on Discord (design channel, April 15th, 2021).

-5 Some minor typos corrected.
When encountered some minor typos are corrected.

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

Tantacrul · 2021-05-14T11:13:39Z

The new position of the soloist button is working well, I think.

We'll need to do a bit of UI cleanup on the button. One quick thing: I think we should reduce the distance between the edges of the text and the edge of the button

I also think we need to create a special button style just for this. @njvdberg - are you comfortable implementing that or should I ask @cbjeukendrup or @Eism ?

njvdberg · 2021-05-14T18:31:57Z

@Tantacrul Depends on how difficult the specs of this new button will be and on the urgency. If it isn't the most urgent job, I'm willing to give it try, always nice to explore new things. I suppose I can fallback on @cbjeukendrup and/or @Eism in case I'm running into problems. Nice MSoC project (Musescore Summer of Code) 😃

cbjeukendrup · 2021-05-14T19:27:44Z

@njvdberg I would recommend to extend the existing FlatButton component, rather than creating a new one. You could add a property called something like narrowMargins, and then take that into account for the width.

Currently, the 'calculation' for the width is on one line, so when taking the new property into account, I think it's a good idea to write it out like

    width: {
        if (...) {
            return ...
        }

        return ...
    }

njvdberg · 2021-05-24T06:40:54Z

PR #8147 requires this PR, so please merge this PR before PR #8147.

src/libmscore/undo.h

src/instruments/view/instrumentlistmodel.cpp

src/instruments/instrumentstypes.h

RomanPudashkin · 2021-05-24T09:06:53Z

@vshalkevich please, check this PR

vshalkevich · 2021-05-24T20:07:59Z

@njvdberg Could you rebuild failed MU4 file for Window 10 x64 ? I would like to check also on it

cbjeukendrup · 2021-05-24T20:14:32Z

Could you rebuild failed MU4 file for Window 10 x64 ? I would like to check also on it

It must have failed due to the Chocolatey package manager server being down due to maintenance. Now, it should be working again, so when triggering the workflow again, it will build.

njvdberg · 2021-05-25T05:07:39Z

It must have failed due to the Chocolatey package manager server being down due to maintenance.

I didn't realize that thing was down to whatever reason but I reckoned the cause was somewhere outside my scope 😉

cbjeukendrup · 2021-05-26T17:46:03Z

src/instruments/internal/instrumentsreader.cpp

            instrument.transpose.diatonic = reader.readElementText().toInt();
        } else if (reader.name() == "instrumentId") {
-            instrument.id = reader.readElementText();
+            instrument.musicXMLid = reader.readElementText();


Why are both "instrumentId" and "musicXMLid" going to instrument.musicXMLid?

"instrumentId" is the unique identification, that's the one which we really need. "muscXMLid" is still used somewhere, e.g. when reading a score which doesn't have a id specified for an instrument. Then musicXMLid is used for guess what instrument it should be. It is also used for reading MU1 and MU2 scores.
So it is best keep this parameter (and up-to-date).

Shouldn't "instrumentId" then go to instrument.id instead of instrument.musicXMLid?

No, in the Instrument section of the score file, the MusicXMLid is called instrumentId (because was used as an id in older version of MuseScore. The same MusicXMLid is defined in instruments.xml with the musicXMLid tag.
An example:
In instruments.xml the Flute is defined as

<Instrument id="flute"> <family>flutes</family> <longName>Flute</longName> <shortName>Fl.</shortName> <description>Standard Concert Flute</description> <musicXMLid>wind.flutes.flute</musicXMLid> . .

In the score file the same Flute appears as

<Instrument id="flute"> <longName>Flute</longName> <shortName>Fl.</shortName> . . <instrumentId>wind.flutes.flute</instrumentId> . .

But welcome in the wonder world of instrument id's 😉 Here is some history....

Ah, now I understand! Thanks!

My pleasure 😃

This drove me crazy last year, all these id's and in the meantime changing names.

For MU4, I think we would be justified in changing <instrumentId> to <MusicXMLid> in the MSCX file format and using compatibility code to deal with old scores during import. There will already be other changes in the file format (e.g. for the Smart Tempos project), so it might be worth tidying up the syntax here and potentially a few other places too.

Edit: created issue https://musescore.org/en/node/322680

Changing the tag <instrumentId> into <MusicXMLid> would be nice and makes thing more clear 😄

…fined by the "id" attribute of the "instrument" tag in instruments.xml. Reasons for this change are: - musicXMLid isn't unique for instruments. - not all instruments have a musicXMLid defined.

…and use the instrument names otherwise. The behavior is now similar as it was in 3.x. The PR is required for the upcoming score ordering PR which needs part information for the ordering.

…ctedInstrumentInfo for each part and no longer for each instrument in each part.

Replace "instrument" in some variables/methods by "part" which actually is. Remove Excerpt when assoicated score is empty (doesn't contain any staves). This happens when all parts are rmoved from the excerpt.

…order names. Form will show initial "soloist" status and implements soloist toggling.

njvdberg · 2021-06-03T14:10:31Z

Just another rebase.

njvdberg force-pushed the instruments-to-parts branch from 1e00aa6 to 3601da4 Compare May 13, 2021 18:47

This was referenced May 13, 2021

[MU4] Show part name in instrument form instead of instrument name. #8048

Closed

[MU4] Change instrument id from musicXMLid to an unique instrument id #7995

Closed

njvdberg force-pushed the instruments-to-parts branch from 3601da4 to 010f9ed Compare May 13, 2021 18:54

njvdberg force-pushed the instruments-to-parts branch 3 times, most recently from d83c9d7 to d38c9d2 Compare May 23, 2021 18:31

njvdberg mentioned this pull request May 24, 2021

[MU4] Handling of Parts and Excerpt in instrument panel #8147

Merged

8 tasks

RomanPudashkin reviewed May 24, 2021

View reviewed changes

src/libmscore/undo.h Outdated Show resolved Hide resolved

RomanPudashkin reviewed May 24, 2021

View reviewed changes

src/instruments/view/instrumentlistmodel.cpp Outdated Show resolved Hide resolved

RomanPudashkin reviewed May 24, 2021

View reviewed changes

src/instruments/instrumentstypes.h Outdated Show resolved Hide resolved

RomanPudashkin reviewed May 24, 2021

View reviewed changes

src/instruments/instrumentstypes.h Outdated Show resolved Hide resolved

njvdberg force-pushed the instruments-to-parts branch 2 times, most recently from e0149f7 to a62ecfe Compare May 24, 2021 16:56

RomanPudashkin approved these changes May 24, 2021

View reviewed changes

cbjeukendrup reviewed May 26, 2021

View reviewed changes

njvdberg force-pushed the instruments-to-parts branch from a62ecfe to 30721cd Compare June 1, 2021 11:59

njvdberg added 5 commits June 3, 2021 16:09

Correct a typo in method name and variable name.

4d019e9

Change instrument id from musicXMLid to an unique instrument id as de…

d302f3f

…fined by the "id" attribute of the "instrument" tag in instruments.xml. Reasons for this change are: - musicXMLid isn't unique for instruments. - not all instruments have a musicXMLid defined.

If opening ChooseInstrumentsPage, display the part name if available …

7855385

…and use the instrument names otherwise. The behavior is now similar as it was in 3.x. The PR is required for the upcoming score ordering PR which needs part information for the ordering.

InstrumentListModel::initSelectedInstruments will add one single Sele…

198573f

…ctedInstrumentInfo for each part and no longer for each instrument in each part.

Read the information for the QML forms and add/remove parts accordingly.

01a880d

Replace "instrument" in some variables/methods by "part" which actually is. Remove Excerpt when assoicated score is empty (doesn't contain any staves). This happens when all parts are rmoved from the excerpt.

Moved "Make/Undo Soloist" button to instrument line to make room for …

d4e619c

…order names. Form will show initial "soloist" status and implements soloist toggling.

njvdberg force-pushed the instruments-to-parts branch from 30721cd to d4e619c Compare June 3, 2021 14:09

RomanPudashkin merged commit 78928dd into musescore:master Jun 3, 2021

njvdberg deleted the instruments-to-parts branch June 4, 2021 08:01

This was referenced Jun 7, 2021

[MU4] Score ordering #8267

Merged

[MU4] Optional smaller margin for FlatButton #8304

Merged

njvdberg mentioned this pull request Jun 30, 2021

[MU4] Instruments transpositions [new solution] #8432

Merged

Jojo-Schmitz mentioned this pull request Jul 23, 2021

[MU3 Issue] MuseScore 3.6.3 or 3.7.0, PRs to be merged and issues to be fixed. #7449

Closed

Jojo-Schmitz mentioned this pull request Sep 4, 2021

[MU3] Fix GH#7449: Almost everything suitable for 3.6.3 or 3.7.0 #9000

Closed

[MU4] Preparation ScoreOrdering: part names in instruments form #8099

[MU4] Preparation ScoreOrdering: part names in instruments form #8099

Uh oh!

Conversation

njvdberg commented May 13, 2021

Uh oh!

Tantacrul commented May 14, 2021

Uh oh!

njvdberg commented May 14, 2021

Uh oh!

cbjeukendrup commented May 14, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

njvdberg commented May 24, 2021

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

RomanPudashkin commented May 24, 2021

Uh oh!

vshalkevich commented May 24, 2021

Uh oh!

cbjeukendrup commented May 24, 2021

Uh oh!

njvdberg commented May 25, 2021

Uh oh!

cbjeukendrup May 26, 2021

Choose a reason for hiding this comment

Uh oh!

njvdberg May 26, 2021

Choose a reason for hiding this comment

Uh oh!

cbjeukendrup May 26, 2021

Choose a reason for hiding this comment

Uh oh!

njvdberg May 26, 2021

Choose a reason for hiding this comment

Uh oh!

cbjeukendrup May 26, 2021

Choose a reason for hiding this comment

Uh oh!

njvdberg May 26, 2021

Choose a reason for hiding this comment

Uh oh!

shoogle Jun 30, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

njvdberg Jul 1, 2021 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

njvdberg commented Jun 3, 2021

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

6 participants

cbjeukendrup commented May 14, 2021 •

edited

Loading

shoogle Jun 30, 2021 •

edited

Loading

njvdberg Jul 1, 2021 •

edited

Loading