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

GSoC 2020: Measure repeats for Mu3 #519

Open
wants to merge 5 commits into
base: 3.x
Choose a base branch
from
Open

Conversation

Jojo-Schmitz
Copy link
Owner

@Jojo-Schmitz Jojo-Schmitz commented Jun 24, 2024

Backport of musescore#6365

Resolves: #438

  • Re-enable NOBREAK with fixes and new functionality

    • Fix #279071: "Don't Break" element creates hole at end of system
    • Allow more than two measures to be grouped
    • Allow adding/toggling NOBREAK by clicking palette
    • Rename to "Group Measures"
    • Adjust placement of break symbols
      Co-authored-by: MarcSabatella marc@outsideshore.com

    commit 1, plus some includes cleanup and fixing some clazy warnings

  • commit 2 is just about some Mu4 code style stuff which doesn't apply to Mu3, so let's skip it

  • Fix #10220: Replace RepeatMeasure with MeasureRepeat, add subtypes 1/2/4

    • Draw with font symbols instead of QPainterPath
    • Automatically group measures and delete contents when adding MeasureRepeat
    • Hide rests by making measures (per MStaff) aware if they are part of measure repeat group
    • Keep measures and element in sync at all times by handling (preventing/warning/special-casing) many user actions
    • Add style options for numbering consecutive one-measure repeats

    commit 3, plus some includes cleanup and fixing some clazy warnings

  • MusicXML import/export and (probably) Guitar Pro import MeasureRepeats
    commit 4 and fixing some clazy warnings

  • Add/update tests for MMRests and MeasureRepeats
    MMRests:

    • Add vtests for old-style (all fonts), h-bar thickness and margin (Bravura)

    MeasureRepeats:

    • Add script tests for adding, cutting/copying with partial group selected, pasting into group, repeating selection from before group, executing split/join/insert/delete measure commands, adding repeat barlines, and adding time signature
    • Add mtests for parts, MIDI, and MusicXML import/export
    • Add vtests
    • Update ref files

    commit 5 ( I might better integrate them into the other commits as needed though)

  • commit 6 is about Additional changes needed after rebasing, shouldn't apply here, so let's skip it too

@Jojo-Schmitz Jojo-Schmitz changed the title GSoC 2020: measure repeats GSoC 2020: measure repeats for Mu3 Jun 24, 2024
@Jojo-Schmitz Jojo-Schmitz changed the title GSoC 2020: measure repeats for Mu3 GSoC 2020: Measure repeats for Mu3 Jun 24, 2024
@Jojo-Schmitz Jojo-Schmitz force-pushed the 3.x-measure-repeats branch 3 times, most recently from 37793a2 to 6cc2682 Compare June 26, 2024 15:08
- Fix #279071: "Don't Break" element creates hole at end of system
- Allow more than two measures to be grouped
- Allow adding/toggling NOBREAK by clicking palette
- Rename to "Group Measures"
- Adjust placement of break symbols
Co-authored-by: MarcSabatella <marc@outsideshore.com>

Backport of musescore#6365, commit 1, plus some includes cleanup and fixing some clazy warnings
@Jojo-Schmitz
Copy link
Owner Author

the mtests and vtests failures are (mostly) due to crashes, so more work to do...

@Jojo-Schmitz Jojo-Schmitz force-pushed the 3.x-measure-repeats branch 2 times, most recently from ed06d26 to 4af7cfb Compare November 17, 2024 15:27
…btypes 1/2/4

- Draw with font symbols instead of QPainterPath
- Automatically group measures and delete contents when adding MeasureRepeat
- Hide rests by making measures (per MStaff) aware if they are part of measure repeat group
- Keep measures and element in sync at all times by handling (preventing/warning/special-casing) many user actions
- Add style options for numbering consecutive one-measure repeats

Backport of musescore#6365, commit 3, plus some includes cleanup and fixing some clazy warnings
Backport of musescore#6365, commit 4, plus some includes cleanup and fixing a few clazy warnings
MMRests:

- Add vtests for old-style (all fonts), h-bar thickness and margin (Bravura)

MeasureRepeats:

- Add script tests for adding, cutting/copying with partial group selected, pasting into group, repeating selection from before group, executing split/join/insert/delete measure commands, adding repeat barlines, and adding time signature
- Add mtests for parts, MIDI, and MusicXML import/export
- Add vtests
- Update ref files

Backport of musescore#6365, commit 4
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
strings Affects translatable strings
Projects
None yet
Development

Successfully merging this pull request may close these issues.

add 2 bars and 4 bars repeat
3 participants