Fix: 303027 - Add System lines #5965

njvdberg · 2020-04-17T18:06:55Z

Resolves: https://musescore.org/en/node/303027

This PR add System Text Lines. System Text Lines are like Text Lines but are attached to a system instead of staff. System Text Lines are implemented as an extension of the existing TextLine. In the Inspector the TextLine will show an new button, System Text Line. With this
button a TextLine can changed into a SystemTextLine and vice versa.

To be consistent with the StaffText and SystemText, in the palette both original TextLine and the new SystemTextLine will appear as two items.
To support different styles for both text lines, TextLine now supports two different styles. Depending on the value of systemFlag() the correct style is chosen.

In the MSCX/MSCZ file the new SystemTextFile is saved a TextLine with attribute system=1. A system attribute has the value 0, or is missing, indicates a TextLine.

In MusicXML, SystemTextLine's are exported as normal TextLine's. Also, when a score containing SystemTextLine's is loaded into an older 3.* version, these SystemTextLine's are seen as normal TextLine's.

This PR replaces #5925

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

RobFog · 2020-06-22T20:50:09Z

Rebase needed.

njvdberg · 2020-06-23T13:18:42Z

Rebase done.

Jojo-Schmitz · 2020-11-09T10:00:41Z

Another rebase needed...

njvdberg · 2020-11-12T12:19:04Z

Rebase done (getting experienced 😉)

Jojo-Schmitz · 2020-11-12T12:21:40Z

looks like the mtest fail is not your fault, but a network issue

njvdberg · 2020-11-12T13:31:35Z

looks like the mtest fail is not your fault, but a network issue

Push again solved the problem. We be nice if all issues were that easy 😃

vpereverzev · 2020-11-16T02:23:49Z

mscore/menus.cpp

-      sp->append(textLine, QT_TRANSLATE_NOOP("Palette", "Text line"));
+      sp->append(textLine, QT_TRANSLATE_NOOP("Palette", "Staff Text line"));
+
+      TextLine* systemTextLine = new TextLine(gscore, true);


I'm wondering where "systemTextLine" will be deleted from heap

Nowhere, this is and stays in the palette. Similar as the other elements here.

vpereverzev · 2020-11-16T02:25:11Z

mscore/menus.cpp

@@ -1466,9 +1466,15 @@ PalettePanel* MuseScore::newLinesPalettePanel()

      TextLine* textLine = new TextLine(gscore);
      textLine->setLen(w);
-      textLine->setBeginText("VII");


Just curious
Why was it here? :)

For a Capo/Barre ? I think it should stay.

Using a Roman Chord identifier in a trill line doesn't make much sense, does it?

It is not a trill lin, it is after the trill lines...

It is (supposed to be an example for) a Capo line, the Roman number supposed to denote the fret you should place the capo at (here: fret 7), as far as I can tell

Sorry, I misread the location.
In the old textline (which was on the staff only), there was this text VII. But now we have the same element which can be both be system and non-system but they have their own entry on the palette. So the text VII is changed to Staff to indicate a staff textline. The new system textline will have the text System. The old VII had no real meaning.

libmscore/style.cpp

vpereverzev · 2020-11-16T02:29:28Z

libmscore/textline.cpp

+//---------------------------------------------------------
+
+static const ElementStyle systemTextLineStyle {
+//       { Sid::systemTextLineSystemFlag,           Pid::SYSTEM_FLAG             },


Does this really need to be commented out? I thought you used it in several places

The flag is set at another place since the textline can now be both system and non-system.

Jojo-Schmitz · 2020-11-17T09:39:13Z

mscore/menus.cpp

      textLine->setEndHookType(HookType::HOOK_90);
-      sp->append(textLine, QT_TRANSLATE_NOOP("Palette", "Text line"));
+      sp->append(textLine, QT_TRANSLATE_NOOP("Palette", "Staff Text line"));


Not sure how to name it then though. It certainly is (an example for) a staff based text line.

As requested, this PR includes the same textline twice on the palette, once as a "Staff Text Line" (which was the original Text Line) and a new "System Text Line" which is a few lines lower. Leaving the original name unchanged could cause confusion.

vpereverzev · 2020-11-30T10:41:54Z

@njvdberg there are some issues with mtests here

Jojo-Schmitz · 2020-12-01T13:45:34Z

The mtest score mtest/libmscore/parts/part-textlines.mscx needs to get adjusted.
And a rebase is needed once again too.

Jojo-Schmitz · 2020-12-01T17:39:44Z

5 vtest 'issues' with trill lines being offset slightly, guess those are expected?
before:

after:

diff:

Similar for Gonville, Emmentaler (or Edwin?) and MuseJazz

This PR adds System Text Lines. System Text Lines are like Text Lines but are attached to a system instead of staff. System Text Lines are implemented as an extention of the existing TextLine. In the Inspector The TextLine will show an new button, System Text Line. With this button a TextLine can changed into a SystemTextLine and vice versa. To be consistent with the StaffText and SystemText, in the palette both original TextLine and the new SystemTextLine will appear as two items. To support different styles for both text lines, TextLine now supports two different styles. Depending on the value of systemFlag() the correct style is chosen. In the MSCX/MSCZ file the new SystemTextFile is saved a TextLine with attribute "system=1". If system attribute has the value 0, or is missing, indicates a TextLine. In MusicXML, SystemTextLine's are exported as normal TextLine's. Also, when a score containing SystemTextLine's is loaded into an older 3.* version, these SystemTextLine's are seen as normal TextLine's.

njvdberg · 2020-12-03T16:46:14Z

These vtest violations are not expected. And even wrong 😉.
The reason was this PR overwrote the style setting Sid::trillMinDistance which was changed in the meantime.

Jojo-Schmitz · 2020-12-03T17:09:39Z

Ah, good to have them then ;-)

MarcSabatella · 2021-01-13T05:46:23Z

libmscore/textline.cpp

+            MuseScoreCore::mscoreCore->updateInspector();
+            return;
+            }
+      initStyle();


What is the purpose of this? It causes any change to one property to reset all other properties to style defaults.

Export the volta text to the MusicXML ending element, allowing custom text such as "1-3". Backport of #10623, plus 2 more mtest fixes

njvdberg force-pushed the issue-303027-textline-systemflag branch from da40c39 to b1d03c1 Compare April 19, 2020 07:57

njvdberg mentioned this pull request Apr 28, 2020

MuseScore 3.5 Alpha PRs to be merged #5960

Closed

anatoly-os added this to the MuseScore 3.5 Beta milestone Apr 29, 2020

anatoly-os mentioned this pull request May 3, 2020

MuseScore 3.5 Beta. PRs to be merged #6027

Closed

12 tasks

anatoly-os removed this from the MuseScore 3.5 Beta milestone Jun 22, 2020

njvdberg force-pushed the issue-303027-textline-systemflag branch from b1d03c1 to 1b146bd Compare June 23, 2020 13:16

njvdberg changed the base branch from master to 3.x June 23, 2020 13:16

njvdberg force-pushed the issue-303027-textline-systemflag branch from 1b146bd to e0f3bc6 Compare June 23, 2020 13:18

Jojo-Schmitz mentioned this pull request Nov 9, 2020

MuseScore 3.6 Alpha. PRs to be merged and issues to be fixed. #6505

Closed

74 tasks

njvdberg force-pushed the issue-303027-textline-systemflag branch from e0f3bc6 to 85911cd Compare November 12, 2020 12:17

njvdberg force-pushed the issue-303027-textline-systemflag branch from 85911cd to 211dc59 Compare November 12, 2020 12:40

vpereverzev reviewed Nov 16, 2020

View reviewed changes

Jojo-Schmitz reviewed Nov 17, 2020

View reviewed changes

njvdberg force-pushed the issue-303027-textline-systemflag branch from 211dc59 to 66231b6 Compare November 17, 2020 10:39

Jojo-Schmitz mentioned this pull request Nov 17, 2020

MuseScore 3.6 Beta/RC/Release. PRs to be merged and issues to be fixed. #6887

Closed

njvdberg force-pushed the issue-303027-textline-systemflag branch from 66231b6 to 8750dfe Compare December 1, 2020 15:48

njvdberg force-pushed the issue-303027-textline-systemflag branch from 8750dfe to 8ecbeec Compare December 3, 2020 16:43

vpereverzev merged commit a2f4f1b into musescore:3.x Dec 8, 2020

njvdberg mentioned this pull request Dec 9, 2020

[MU3] Update mtest after spatium change. #7056

Merged

8 tasks

Jojo-Schmitz mentioned this pull request Dec 11, 2020

[MU3] Fix compiler warnings #7066

Merged

MarcSabatella reviewed Jan 13, 2021

View reviewed changes

igorkorsukov added a commit to igorkorsukov/MuseScore that referenced this pull request Feb 8, 2021

ported musescore#5965 : Fix: 303027 - Add System lines

47fe31f

igorkorsukov mentioned this pull request Feb 8, 2021

[MU4] Ported #5965 : Fix: 303027 - Add System lines #7448

Merged

vpereverzev pushed a commit that referenced this pull request Feb 8, 2021

ported #5965 : Fix: 303027 - Add System lines

93bfbf3

njvdberg deleted the issue-303027-textline-systemflag branch March 10, 2021 12:49

lvinken referenced this pull request Feb 22, 2022

Fix #329608: [MusicXML export] custom ending text not exported

a24083a

Export the volta text to the MusicXML ending element, allowing custom text such as "1-3". Backport of #10623, plus 2 more mtest fixes

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fix: 303027 - Add System lines #5965

Fix: 303027 - Add System lines #5965

njvdberg commented Apr 17, 2020 •

edited

Loading

RobFog commented Jun 22, 2020

njvdberg commented Jun 23, 2020

Jojo-Schmitz commented Nov 9, 2020

njvdberg commented Nov 12, 2020

Jojo-Schmitz commented Nov 12, 2020

njvdberg commented Nov 12, 2020

vpereverzev Nov 16, 2020

njvdberg Nov 17, 2020

vpereverzev Nov 16, 2020

Jojo-Schmitz Nov 16, 2020

njvdberg Nov 17, 2020

Jojo-Schmitz Nov 17, 2020 •

edited

Loading

njvdberg Nov 17, 2020

vpereverzev Nov 16, 2020

njvdberg Nov 17, 2020

Jojo-Schmitz Nov 17, 2020 •

edited

Loading

njvdberg Nov 17, 2020

vpereverzev commented Nov 30, 2020

Jojo-Schmitz commented Dec 1, 2020 •

edited

Loading

Jojo-Schmitz commented Dec 1, 2020 •

edited

Loading

njvdberg commented Dec 3, 2020

Jojo-Schmitz commented Dec 3, 2020

MarcSabatella Jan 13, 2021

Fix: 303027 - Add System lines #5965

Fix: 303027 - Add System lines #5965

Conversation

njvdberg commented Apr 17, 2020 • edited Loading

RobFog commented Jun 22, 2020

njvdberg commented Jun 23, 2020

Jojo-Schmitz commented Nov 9, 2020

njvdberg commented Nov 12, 2020

Jojo-Schmitz commented Nov 12, 2020

njvdberg commented Nov 12, 2020

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Jojo-Schmitz Nov 17, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Jojo-Schmitz Nov 17, 2020 • edited Loading

Choose a reason for hiding this comment

Choose a reason for hiding this comment

vpereverzev commented Nov 30, 2020

Jojo-Schmitz commented Dec 1, 2020 • edited Loading

Jojo-Schmitz commented Dec 1, 2020 • edited Loading

njvdberg commented Dec 3, 2020

Jojo-Schmitz commented Dec 3, 2020

Choose a reason for hiding this comment

njvdberg commented Apr 17, 2020 •

edited

Loading

Jojo-Schmitz Nov 17, 2020 •

edited

Loading

Jojo-Schmitz Nov 17, 2020 •

edited

Loading

Jojo-Schmitz commented Dec 1, 2020 •

edited

Loading

Jojo-Schmitz commented Dec 1, 2020 •

edited

Loading