Multi-measure rests: better handling of vertical serifs

Audiveris · Jan 9, 2024 · d9b7691 · d9b7691
1 parent 83e1373
commit d9b7691
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 4 deletions.
diff --git a/src/main/org/audiveris/omr/sheet/beam/MultipleRestsBuilder.java b/src/main/org/audiveris/omr/sheet/beam/MultipleRestsBuilder.java
@@ -257,11 +257,11 @@ private Map<HorizontalSide, StaffPeak> getSerifPeaks (BeamInter beam,
         final Map<HorizontalSide, StaffPeak> serifPeaks = new EnumMap<>(HorizontalSide.class);
         final StaffProjector projector = getProjector(staff);
         final Rectangle bounds = beam.getBounds();
+        final int addedChunk = (int) Math.rint(
+                beam.getHeight() - staff.getMidLine().getThickness());
 
         for (HorizontalSide side : HorizontalSide.values()) {
             final int x = (side == HorizontalSide.LEFT) ? bounds.x : bounds.x + bounds.width - 1;
-            final int addedChunk = (int) Math.rint(
-                    beam.getHeight() - staff.getMidLine().getThickness());
             final List<StaffPeak> peaks = projector.processMultiRestSide(x, side, addedChunk);
             logger.debug("{} {} {}", beam, side, peaks);
 

diff --git a/src/main/org/audiveris/omr/sheet/grid/StaffProjector.java b/src/main/org/audiveris/omr/sheet/grid/StaffProjector.java
@@ -1279,11 +1279,15 @@ public List<StaffPeak> processMultiRestSide (int x,
 
         final int dx = params.verticalSerifWidth;
         final int minCount = params.barThreshold / 2;
-        final int outDer = minCount - params.linesThreshold;
-        final int inDer = minCount - addedChunk;
+        final int outDer = Math.max(1, minCount - (3 * params.linesThreshold / 4));
+        final int inDer = Math.max(1, outDer - addedChunk);
         final int minDerUp = (restSide == HorizontalSide.LEFT) ? outDer : inDer;
         final int minDerDown = (restSide == HorizontalSide.LEFT) ? inDer : outDer;
 
+        // Adjust x to target the middle of expected serif
+        final int halfDx = (int) Math.ceil(dx * 0.5);
+        x += (restSide == HorizontalSide.LEFT) ? halfDx / 2 : -halfDx / 2;
+
         final List<StaffPeak> sidePeaks = findPeaksInRange(
                 x - dx,
                 x + dx,