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

[MU3 Backend] ENG-42 & ENG-14: MusicXML Barlines fixes #8175

Merged

Conversation

iveshenry18
Copy link
Contributor

Resolves: ENG-42: Final barlines must be joined over grand staff, and ENG-14: Double barlines faulty on grand staff

Fixes issues with final barlines and other barlines in grand staves. The former is fixed with a port from 3080d21.

  • 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

This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.
@iveshenry18 iveshenry18 changed the title ENG-42 & ENG-14: MusicXML Barlines fixes [MU3 Backend ]ENG-42 & ENG-14: MusicXML Barlines fixes May 26, 2021
@iveshenry18 iveshenry18 changed the title [MU3 Backend ]ENG-42 & ENG-14: MusicXML Barlines fixes [MU3 Backend] ENG-42 & ENG-14: MusicXML Barlines fixes May 26, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
@vpereverzev vpereverzev merged commit 636ac19 into musescore:3.6.2_backend May 28, 2021
@Jojo-Schmitz Jojo-Schmitz mentioned this pull request Jun 2, 2021
1 task
@wizofaus
Copy link
Contributor

wizofaus commented Jun 2, 2021

Where is testSystemBrackets3_ref.mscx loaded and verified?
I can't find "SystemBrackets3" anywhere in the source code at all.

UPDATE: it isn't in the master/MU4 branch, only MU3.6

@iveshenry18
Copy link
Contributor Author

Where is testSystemBrackets3_ref.mscx loaded and verified?
I can't find "SystemBrackets3" anywhere in the source code at all.

UPDATE: it isn't in the master/MU4 branch, only MU3.6

That's correct; these changes are only on this specific branch (3.6.2_backend) for now.

@wizofaus
Copy link
Contributor

wizofaus commented Jun 2, 2021 via email

@iveshenry18
Copy link
Contributor Author

So far this branch does include at least one commit containing code exclusive to this task that does not go in master, but other than that, porting all these to master is indeed the eventual plan as far as I know. You are welcome to do that with any commit you see fit, provided you double-check for any regressions.

@wizofaus
Copy link
Contributor

wizofaus commented Jun 3, 2021

Does "Fetch Upstream" not work for branches other than 'master'? I just did it on my fork but my 3.6.2_backend branch didn't get updated, I had to explicitly merge from the original musescore remote to get the latest changes.

@Jojo-Schmitz
Copy link
Contributor

Jojo-Schmitz commented Jun 4, 2021

git fetch upstream (actually git fetch musescore as that's the name for my upstream repo, an idiosyncrasy of GitHub Desktop) does work for me

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jun 28, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jun 28, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jun 28, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 1, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 1, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 1, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 27, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 27, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 27, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 27, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 27, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 27, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 27, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Jul 27, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 13, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 13, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 13, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 13, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 19, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 19, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 19, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 19, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 19, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 19, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 30, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 30, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Aug 30, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 1, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 1, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 1, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 2, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 2, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 2, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 10, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 10, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 10, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 23, 2021
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 23, 2021
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Sep 23, 2021
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Mar 5, 2023
… (and elsewhere) spans across multi-staff parts

Backport of musescore#8146, but see also musescore#8175
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Mar 5, 2023
This commit is a port of 3080d21 with
some additional tests. It makes sure that when setting the final barline
type on a part with multiple staves, the barline spans the staves.

Additionally, it adds a test just for grand staff barlines, and updates
a test that is now corrected.

Port of musescore#8175, part 1, but see also musescore#8146
Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request Mar 5, 2023
This commit fixes the handling of (non-repeat) barlines on grand staves
by creating a barline for each staff in the part, and setting the
_spanStaff property of the first barline of each multi-staff part.
Also updates the relevant tests.
picpickk

Port of musescore#8175, part 2
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.

None yet

5 participants