StaffEditor: header stop abscissa can be modified/restored

Audiveris · Jan 19, 2024 · 7588503 · 7588503
1 parent 0ea46eb
commit 7588503
Show file tree

Hide file tree

Showing 2 changed files with 22 additions and 254 deletions.
diff --git a/src/main/org/audiveris/omr/image/PixelBuffer.java b/src/main/org/audiveris/omr/image/PixelBuffer.java
diff --git a/src/main/org/audiveris/omr/sheet/ui/StaffEditor.java b/src/main/org/audiveris/omr/sheet/ui/StaffEditor.java
@@ -45,6 +45,7 @@
 import org.audiveris.omr.sheet.Staff;
 import org.audiveris.omr.sheet.StaffLine;
 import org.audiveris.omr.sheet.grid.LineInfo;
+import org.audiveris.omr.sheet.header.StaffHeader;
 import org.audiveris.omr.ui.view.RubberPanel;
 import static org.audiveris.omr.util.HorizontalSide.LEFT;
 import static org.audiveris.omr.util.HorizontalSide.RIGHT;
@@ -305,6 +306,16 @@ public void finalDoit ()
             staffLine.setGlyph(glyph);
         });
 
+        // Update header if so needed
+        final StaffHeader header = staff.getHeader();
+        if (header != null) {
+            if (header.stop == header.start) {
+                final int stop = staff.getAbscissa(LEFT);
+                staff.setHeaderStop(stop);
+                model.headerStop = stop;
+            }
+        }
+
         system.updateCoordinates();
         system.updateArea();
 
@@ -572,6 +583,10 @@ protected void applyModel (StaffModel model)
             staff.setAbscissa(LEFT, (int) Math.rint(left));
             staff.setAbscissa(RIGHT, (int) Math.rint(right));
             staff.setArea(null);
+
+            if (model.headerStop != null) {
+                staff.getHeader().stop = model.headerStop;
+            }
         }
 
         /**
@@ -711,9 +726,16 @@ protected static abstract class StaffModel
         /** Sections removed from hLag. */
         public final Set<Section> hLagRemovals = new HashSet<>();
 
+        /** Header stop, if any. */
+        public Integer headerStop;
+
         public StaffModel (Staff staff)
         {
             staff.getLines().forEach(l -> staffLineGlyphs.add(((StaffLine) l).getGlyph()));
+
+            if (staff.getHeader() != null) {
+                headerStop = staff.getHeader().stop;
+            }
         }
     }
 }