[MU3 Backend] ENG-17: multi-voice beam fix #8108

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.

Sign up for GitHub

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

Jump to bottom

Merged

vpereverzev merged 3 commits into musescore:3.6.2_backend from iveshenry18:ENG-17-multi-voice-beam

May 18, 2021

Contributor

iveshenry18 commented May 15, 2021

Resolves: ENG-17 Beams become unjoined when there are two voices

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam per voice at a time,
avoiding the conflict while retaining the existing logic.

NOTE: this branch currently includes the commits from PR #8100 as well.

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

iveshenry18 added 3 commits

May 12, 2021 19:59


          ENG-27: Apply MusicXML import options and styles for conversion job

bea70b0


          Add visual test and disable now-invalid tests

Mostly unique to the Hal Leonard/Faber conversion job


          ENG-17: Fix beams in multi-voice MusicXML import

acdedb6

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

vpereverzev merged commit 5c203ce into musescore:3.6.2_backend

Contributor

Jojo-Schmitz commented May 18, 2021 •

edited

Loading

Is any of this needed for master too?
@lvinken ?

Contributor Author

iveshenry18 commented May 18, 2021

Yes, I believe the plan is to port this to master later. The previous PR (#8100) will not apply because it is specific to the conversion job I mentioned previously, but this one is a general beaming fix that can apply to all XML imports.

Contributor

Jojo-Schmitz commented May 18, 2021 •

edited

Loading

So that 3rd commit especially, but not the 1st and 2nd (which basically is what #8100 was), right?

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

0e87468

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

f26f0bf

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

9230f9b

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

cad4845

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

9490f02

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

fd885be

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz mentioned this pull request

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

Closed

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

78a5dea

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

9b36c24

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

56f3c4b

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

260841c

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

31753fe

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

b190795

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

0534a51

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

bce7283

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

1f633cb

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

5ae2093

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

0ae4291

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

93d3bca

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

a2d8cbf

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

f434854

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

600db75

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

3b5ea39

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

c05cc58

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

c9bdc17

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

3d16ee8

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

5216dfe

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

9ed26fe

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

ea0cedf

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

036c5de

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

18a5b40

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

0e3e961

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

954e22d

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

93668a1

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

87cce9d

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz mentioned this pull request

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

Closed

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

5e3ca8f

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

8c165c0

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

dfa0ca3

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

3e1f6e6

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

d1b855f

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

544e909

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

d03dcd6

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

1be2add

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

21763da

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

83ee504

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

2cf1bc9

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

ab07ade

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

asattely mentioned this pull request

[From MU3 Backend] ENG-17: Fix beams in multi-voice MusicXML import #9502

Closed

Jojo-Schmitz mentioned this pull request

Fix GH#7449: Almost everything suitable for 3.6.3 or 3.7.0 Jojo-Schmitz/MuseScore#80

Closed

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-27: Apply MusicXML import options and styles for conversion job

6f31ca8

Port of musescore#8108, part 1

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          Add visual test and disable now-invalid tests

f2f2788

Mostly unique to the Hal Leonard/Faber conversion job

Port of musescore#8108, part 2

Jojo-Schmitz pushed a commit to Jojo-Schmitz/MuseScore that referenced this pull request


          ENG-17: Fix beams in multi-voice MusicXML import

The presence of a second voice would prematurely break
beams upon MusicXML import in some cases, as only one beam was
stored at a time as the "current beam", and this would get thrown away
if a note in another voice/track was handled before the end of a
beam. This commit adds a QMap to store one beam *per voice* at a time,
avoiding the conflict while retaining the existing logic.

Port of musescore#8108, part 3

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet