audiveris
audiveris copied to clipboard
Audiveris
MusicXML export for drum parts, and new drum note heads
@hbitteur This pull request includes commits which were in progress on my drum-notation branch involving exporting MusicXML files for drum scores. I also added support for the three triangle_down note heads (filled, void, and whole note) and for the two missing x-shaped note heads (void and whole note). I believe the .xml export for drum scores is now very close to finished.
I'll post more-detailed comments about these commits, a new percussion test score I've been using, some questions for you, and some remarks about what still isn't quite working, on the Audiveris issue "Drum notation?" https://github.com/Audiveris/audiveris/issues/33.
I have just merged this PR into the "development" branch.
Le 19/05/2022 à 22:07, brian-math a écrit :
@hbitteur https://github.com/hbitteur This pull request includes commits which were in progress on my drum-notation branch involving exporting MusicXML files for drum scores. I also added support for the three triangle_down note heads (filled, void, and whole note) and for the two missing x-shaped note heads (void and whole note). I believe the .xml export for drum scores is now very close to finished.
I'll post more-detailed comments about these commits, a new percussion test score I've been using, some questions for you, and some remarks about what still isn't quite working, on the Audiveris issue "Drum notation?" #33 https://github.com/Audiveris/audiveris/issues/33.
You can view, comment on, or merge this pull request online at:https://github.com/Audiveris/audiveris/pull/578
Commit Summary
8d0f4d2 https://github.com/Audiveris/audiveris/pull/578/commits/8d0f4d204ce5b6a6ca379e0fcbeea4d09b66acc6 First steps recognizing diamond (filled & hollow) percussion noteheads and getting stem/beam connections
ce97610 https://github.com/Audiveris/audiveris/pull/578/commits/ce976106850aded17558af14116d5d89c54e37a4 Switch to Tesseract 4.1.1 and Javacpp-presets 1.5.6.
e527f3c https://github.com/Audiveris/audiveris/pull/578/commits/e527f3c4766e4252d28060f9a3e75033c933b0d5 Properly finish Tesseract API object in getLanguages().
d0b8daa https://github.com/Audiveris/audiveris/pull/578/commits/d0b8daa4fd3ff3d9d1afe15a50165a2db2164ae8 Merge remote-tracking branch 'refs/remotes/upstream/drum-scores' into drum-notation
7755e53 https://github.com/Audiveris/audiveris/pull/578/commits/7755e53058de4cf1fe10c86a005ea6fe0aeba3d8 Add new processing switch 'drum-notation' for unpitched percussion notation
6fc18ec https://github.com/Audiveris/audiveris/pull/578/commits/6fc18ecbc974b6575863b2d9e47ce358789ce3dc TesseractOCR: remove call to setlocale().
973355c https://github.com/Audiveris/audiveris/pull/578/commits/973355ce71745dff4a92eea8f8dc044b44914f27 Additional checks for 1-line staff candidates
25ac110 https://github.com/Audiveris/audiveris/pull/578/commits/25ac110c537c8fb004d8f254be7cad33891560d5 Improved filtering of ledgers
e45bcc4 https://github.com/Audiveris/audiveris/pull/578/commits/e45bcc474bce20159369dab018aa173882a58c0c Add WHOLE_NOTE_DIAMOND; allow diamond and oval heads to share stem; improve processing switch naming (especially FR) and ordering.
3d23823 https://github.com/Audiveris/audiveris/pull/578/commits/3d238237821fc6a866dfeee4520c554ac1134455 Partial support for multiple measure rests by OMR engine
6ab859f https://github.com/Audiveris/audiveris/pull/578/commits/6ab859f49be1cab8f3fc2cc2a22dd5cec8c75d5a Add dummy measures in MusicXML for multiple measure rests
cf0d6da https://github.com/Audiveris/audiveris/pull/578/commits/cf0d6dac6208418befe16965ab9e7b93c62b2a7c Merge branch 'multiple-rest' into drum-notation
649ba77 https://github.com/Audiveris/audiveris/pull/578/commits/649ba77846dbd8f7fe1acff1ef29d61bb6a30824 Partially implements MusicXML export for drum parts
fc3481e https://github.com/Audiveris/audiveris/pull/578/commits/fc3481ea925c7894e70c0a7499ce13345c79f7fc Merge remote-tracking branch 'upstream/drum-scores' into drum-notation
fc1b893 https://github.com/Audiveris/audiveris/pull/578/commits/fc1b893e7d1558ecb8404da10145c3f962caceaa Continues MusicXML export for drum parts -- almost complete except for a few missing notehead shapes
8160378 https://github.com/Audiveris/audiveris/pull/578/commits/8160378abefbf255b4f01937b8db109607e5a738 Merge remote-tracking branch 'upstream/drum-scores' into drum-notation
b7c73d3 https://github.com/Audiveris/audiveris/pull/578/commits/b7c73d36a7bd5363f18d9b3375306ff2fcc411d2 Adds new drum noteheads - triangles and hollow x's -- and completes MusicXML export for drum parts
File Changes(10 files https://github.com/Audiveris/audiveris/pull/578/files)
M src/main/org/audiveris/omr/glyph/Shape.java https://github.com/Audiveris/audiveris/pull/578/files#diff-16aa47d482b6dfa6f7a72d2d1a1cfb1a72f932c8db97c7f2b636279ec297ddbd (5)
M src/main/org/audiveris/omr/glyph/ShapeSet.java https://github.com/Audiveris/audiveris/pull/578/files#diff-c2e43d81c46868ef601ce2d02a40dffd39f3454427e1b3850b07e14c6116721b (30)
M src/main/org/audiveris/omr/image/TemplateFactory.java https://github.com/Audiveris/audiveris/pull/578/files#diff-839fb33c5b81030bc505a5f11fafcc7685f2910d632bc77656b6d1ffdca22da3 (25)
M src/main/org/audiveris/omr/score/PartwiseBuilder.java https://github.com/Audiveris/audiveris/pull/578/files#diff-159226ecd03b1e3de1c6d909a1d676ed77347832ed2921295cf41247c2a37cdf (151)
M src/main/org/audiveris/omr/sheet/curve/Skeleton.java https://github.com/Audiveris/audiveris/pull/578/files#diff-79a953e4d872d83664ec60fc447fa122c4481b67c5b37c96a8730f8399da6643 (5)
M src/main/org/audiveris/omr/sheet/symbol/InterFactory.java https://github.com/Audiveris/audiveris/pull/578/files#diff-0b46c6579e558f9ba7c1ed12f6ffac1fce94809e92441a34427cfcb500196a4f (5)
M src/main/org/audiveris/omr/sheet/ui/TemplateBoard.java https://github.com/Audiveris/audiveris/pull/578/files#diff-7833a8783a4e205431b75364fdeb278b66ca200973d0b990501fd7b2328b8ec5 (2)
M src/main/org/audiveris/omr/sig/SigReducer.java https://github.com/Audiveris/audiveris/pull/578/files#diff-0169d1ce87f4e534520452ab3c4d19c65ad7329382f9ff26f722b7d860a16062 (12)
M src/main/org/audiveris/omr/sig/inter/AbstractNoteInter.java https://github.com/Audiveris/audiveris/pull/578/files#diff-f5b79bef50831d77e4ea7b73d71cff53ef39cda7ec69f1097f5b1c7add5c3b68 (5)
M src/main/org/audiveris/omr/ui/symbol/Symbols.java https://github.com/Audiveris/audiveris/pull/578/files#diff-55ebaabcf87f4b24c3530efd21c137bd45b4c6121de45e4e601e25bd56ce6d19 (20)
Patch Links:https://github.com/Audiveris/audiveris/pull/578.patch
https://github.com/Audiveris/audiveris/pull/578.diff
— Reply to this email directly, view it on GitHub https://github.com/Audiveris/audiveris/pull/578, or unsubscribe https://github.com/notifications/unsubscribe-auth/AFIIGAST4UPPBWUVYQ2XMNLVK2NQLANCNFSM5WNKEOKA. You are receiving this because you were mentioned.Message ID: @.***>
-- Hervé Bitteur
Audiveris OMR www.audiveris.com http://www.audiveris.com
-- L'absence de virus dans ce courrier électronique a été vérifiée par le logiciel antivirus Avast. https://www.avast.com/antivirus
I have merged this PR into the "development" branch (not "drum-scores" branch) because drum-scores was merged to development a few days ago. I had to manually fix conflicts on a small dozen of files. This is now OK, but I'd like not to redo the same conflicts fixes.
Please pull development. From now on, it should be more convenient to make small modifs to development directly.