Curation assistant: Fix navivationTo() on display canvas...

... while at it, cull dead code

Author: tferr

src/main/java/sc/fiji/snt/BookmarkManager.java

@@ -1219,7 +1219,7 @@ public Component getTableCellRendererComponent(final JTable table, final Object
     /**
      * Editor for the Tag/Color column - shows color chooser on click
      */
-    class ColorCellEditor extends AbstractCellEditor implements javax.swing.table.TableCellEditor {
+    static class ColorCellEditor extends AbstractCellEditor implements javax.swing.table.TableCellEditor {
         private final JButton editorButton;
         private final JPopupMenu colorChooserPopMenu;
         private Color currentColor;
@@ -1268,21 +1268,6 @@ static String getColorName(Color color) {
             });
         }
 
-        private Color getCustomColor(final Color initialColor) {
-            final Color[] result = new Color[1];// holder for result
-            final JColorChooser chooser = GuiUtils.colorChooser(initialColor);
-            final JDialog dialog = JColorChooser.createDialog(
-                    SwingUtilities.getWindowAncestor(BookmarkTable.this),// parent
-                    "Choose Tag Color", // title
-                    true,               // modal
-                    chooser,            // the chooser instance
-                    e -> result[0] = chooser.getColor(),         // OK button listener
-                    e -> result[0] = null      // Cancel button listener
-            );
-            dialog.setVisible(true);
-            return result[0];
-        }
-
         @Override
         public Object getCellEditorValue() {
             return currentColor;
@@ -1350,10 +1335,6 @@ void setDataList(final List<Bookmark> dataList) {
         fireTableDataChanged();
     }
 
-    String[] getHeader() {
-        return HEADER;
-    }
-
     String getUniqueLabel(final String candidate) {
         final String base = (candidate == null || candidate.isBlank())
                 ? (bvvMode ? "Marker" : String.format("Bookmark %02d", 1 + getDataList().size()))

src/main/java/sc/fiji/snt/SNT.java

@@ -1615,9 +1615,8 @@ else if (editing && !editingPath.isEditableNodeLocked()) {
 		if (editing && editingPath.getEditableNodeIndex() > -1) {
 			statusMessage = "Node " + editingPath.getEditableNodeIndex() + ", ";
 		}
-		statusMessage += "World: (" + SNTUtils.formatDouble(ix * x_spacing, 2) + ", " +
-				SNTUtils.formatDouble(iy * y_spacing, 2) + ", " + SNTUtils.formatDouble(iz *
-				z_spacing, 2) + ");";
+
+		statusMessage += String.format("World: (%.2f, %.2f, %.2f);", ix * x_spacing, iy * y_spacing, iz * z_spacing);
 		if (labelData != null) {
 			final byte b = labelData[iz][iy * width + ix];
 			final int m = b & 0xFF;

src/main/java/sc/fiji/snt/util/ImpUtils.java

@@ -547,15 +547,25 @@ public static void zoomTo(final ImagePlus imp, final double zoomMagnification, f
     public static void zoomTo(final ImagePlus imp, final double zoomMagnification,
                               final PointInImage location, final Path path) {
         if (imp == null || location == null) return;
-        final Calibration cal = imp.getCalibration();
-        final PointInCanvas offset = (path != null)
-                ? path.getCanvasOffset()
-                : new PointInCanvas(0, 0, 0);
-        final int px = (int) (cal.getRawX(location.x) + offset.x);
-        final int py = (int) (cal.getRawY(location.y) + offset.y);
-        final int pz = (int) (cal.getRawZ(location.z) + offset.z);
-        imp.setPosition(imp.getC(), pz + 1, imp.getT());
-        zoomTo(imp, zoomMagnification, px, py);
+        if (location.onPath != null) {
+            zoomToPointInCanvas(imp, zoomMagnification, location.getUnscaledPoint());
+        } else if (path != null) {
+            final PointInImage loc = location.clone();
+            loc.onPath = path;
+            zoomToPointInCanvas(imp, zoomMagnification, loc.getUnscaledPoint());
+        } else {
+            final Calibration cal = imp.getCalibration();
+            final int px = (int) (cal.getRawX(location.x));
+            final int py = (int) (cal.getRawY(location.y));
+            final int pz = (int) (cal.getRawZ(location.z));
+            imp.setPosition(imp.getC(), pz + 1, imp.getT());
+            zoomTo(imp, zoomMagnification, px, py);
+        }
+    }
+
+    private static void zoomToPointInCanvas(final ImagePlus imp, final double zoomMagnification, final PointInCanvas pic) {
+        imp.setPosition(imp.getC(), (int) pic.z + 1, imp.getT());
+        zoomTo(imp, zoomMagnification, (int) pic.x, (int) pic.y);
     }
 
     /**