More strict horizontal assignment of inters to measures

Author: hbitteur

app/src/main/java/org/audiveris/omr/sheet/Part.java

@@ -784,8 +784,7 @@ public List<LyricLineInter> getLyrics ()
     // getMeasureAt //
     //--------------//
     /**
-     * Report the measure that contains a given point (assumed to be in the containing
-     * part).
+     * Report the measure that contains a given point (assumed to be in the containing part).
      *
      * @param point coordinates of the given point
      * @return the containing measure
@@ -799,8 +798,7 @@ public Measure getMeasureAt (Point2D point)
     // getMeasureAt //
     //--------------//
     /**
-     * Report the measure that contains a given point (assumed to be in the containing
-     * part).
+     * Report the measure that contains a given point (assumed to be in the containing part).
      *
      * @param point coordinates of the given point
      * @param staff related staff
@@ -813,10 +811,10 @@ public Measure getMeasureAt (Point2D point,
             return null;
         }
 
-        if ((point.getX() >= staff.getAbscissa(LEFT)) && (point.getX() <= staff.getAbscissa(
-                RIGHT))) {
+        if ((point.getX() >= staff.getAbscissa(LEFT)) //
+                && (point.getX() <= staff.getAbscissa(RIGHT))) {
             for (Measure measure : measures) {
-                PartBarline barline = measure.getRightPartBarline();
+                final PartBarline barline = measure.getRightPartBarline();
 
                 if ((barline == null) || (point.getX() <= barline.getRightX(this, staff))) {
                     return measure;

app/src/main/java/org/audiveris/omr/sheet/SystemInfo.java

@@ -90,16 +90,9 @@
  * @author Hervé Bitteur
  */
 @XmlAccessorType(XmlAccessType.NONE)
-@XmlType(propOrder =
-{
+@XmlType(propOrder = {
         /** NOTA: Sig must be marshalled last. */
-        "id",
-        "indented",
-        "stacks",
-        "parts",
-        "partGroups",
-        "freeGlyphs",
-        "sig" })
+        "id", "indented", "stacks", "parts", "partGroups", "freeGlyphs", "sig" })
 public class SystemInfo
         implements Comparable<SystemInfo>
 {
@@ -1173,7 +1166,7 @@ public MeasureStack getStackAt (Point2D point,
                             }
                         }
 
-                        if ((x >= x1) && (x <= x2)) {
+                        if ((x > x1) && (x <= x2)) { // Away from left, include right
                             return stack;
                         }
                     }

app/src/main/java/org/audiveris/omr/sheet/note/ChordsBuilder.java

@@ -405,7 +405,7 @@ private void dispatchChords ()
 
             if (measure != null) {
                 // Case of chord which have changed of containing measure
-                // while being build head after head
+                // while being built head after head
                 final Measure chordMeasure = chord.getMeasure();
                 if ((chordMeasure != null) && (chordMeasure != measure)) {
                     chordMeasure.removeInter(chord);

app/src/main/java/org/audiveris/omr/sheet/rhythm/Measure.java

@@ -380,7 +380,7 @@ public RestChordInter getChord ()
     public void addInter (Inter inter)
     {
         if (inter.isVip()) {
-            logger.info("VIP addInter {} into {}", inter, this);
+            logger.info("VIP {} addInter {}", this, inter);
         }
 
         switch (inter) {
@@ -599,7 +599,8 @@ public List<Inter> filter (Collection<Inter> inters)
             }
 
             // Precise abscissa limits
-            if ((getAbscissa(LEFT, staff) <= center.x) && (center.x <= getAbscissa(RIGHT, staff))) {
+            if ((getAbscissa(LEFT, staff) < center.x) // Away from left
+                    && (center.x <= getAbscissa(RIGHT, staff))) { // Include right
                 kept.add(inter);
             }
         }

app/src/main/java/org/audiveris/omr/sheet/rhythm/MeasureStack.java

@@ -621,8 +621,10 @@ public List<Inter> filter (Collection<Inter> systemInters)
             }
 
             // Precise abscissa limits
-            if ((measure != null) && (measure.getAbscissa(LEFT, staff) <= center.x)
-                    && (center.x <= measure.getAbscissa(RIGHT, staff))) {
+            if ((measure != null) //
+                    && measures.contains(measure) //
+                    && (measure.getAbscissa(LEFT, staff) < center.x) // Away from left
+                    && (center.x <= measure.getAbscissa(RIGHT, staff))) { // Include right
                 kept.add(inter);
             }
         }

app/src/main/java/org/audiveris/omr/sig/SigReducer.java

@@ -944,8 +944,9 @@ private int checkIsolatedAlters ()
             Part part = staff.getPart();
             Measure measure = part.getMeasureAt(center);
 
-            if ((measure != null) && (measure == part.getLastMeasure()) && (measure
-                    .getPartBarlineOn(HorizontalSide.RIGHT) == null)) {
+            if ((measure != null) //
+                    && (measure == part.getLastMeasure()) //
+                    && (measure.getPartBarlineOn(HorizontalSide.RIGHT) == null)) {
                 // Empty measure?
                 // Measure width?
                 continue;

app/src/main/java/org/audiveris/omr/sig/inter/RestInter.java

@@ -197,7 +197,7 @@ public static RestInter createValid (Glyph glyph,
 
             final Point center = inter.getCenter();
 
-            return (center.x >= left) && (center.x <= right);
+            return (center.x > left) && (center.x <= right); // Away from left, include right
         });
 
         for (Inter chord : measureChords) {