2025.03.14 (1.54q2; Hyperstack points)

Author: rasband

ij/ImageJ.java

@@ -78,8 +78,8 @@ public class ImageJ extends Frame implements ActionListener,
 	MouseListener, KeyListener, WindowListener, ItemListener, Runnable {
 
 	/** Plugins should call IJ.getVersion() or IJ.getFullVersion() to get the version string. */
-	public static final String VERSION = "1.54p";
-	public static final String BUILD = "";
+	public static final String VERSION = "1.54q";
+	public static final String BUILD = "2";
 	public static Color backgroundColor = new Color(237,237,237);
 	/** SansSerif, 12-point, plain font. */
 	public static final Font SansSerif12 = new Font("SansSerif", Font.PLAIN, 12);

ij/Macro.java

@@ -157,6 +157,8 @@ else if (ch==']')
 	}
 
 	public static String trimKey(String key) {
+		if (key==null)
+			return key;
 		int index = key.indexOf(" ");
 		if (index>-1)
 			key = key.substring(0,index);

ij/gui/PointRoi.java

@@ -57,6 +57,7 @@ public class PointRoi extends PolygonRoi {
 	private int nMarkers;
 	private boolean addToOverlay;
 	public static PointRoi savedPoints;
+	private boolean positionSet;
 
 	static {
 		setDefaultType((int)Prefs.get(TYPE_KEY, HYBRID));
@@ -721,6 +722,7 @@ public void setPosition(int n) {
 				Arrays.fill(positions, n);
 		}
 		hyperstackPosition = false;
+		positionSet = true;
 	}
 
 	/** Returns the stack position (image number) of the points in this Roi, if
@@ -729,9 +731,9 @@ public void setPosition(int n) {
 	 *  if there are different stack positions for different points.
 	 */
 	public int getPosition() {
-		if (positions == null || nPoints < 1) {
+		if (positions==null || nPoints<1 || !positionSet)
 			return 0;
-		} else {
+		else {
 			int position = positions[0];
 			for (int i=1; i<nPoints; i++)
 				if (positions[i] != position)
@@ -1024,9 +1026,9 @@ public boolean addToOverlay() {
 
 	public String toString() {
 		if (nPoints>1)
-			return ("Roi[Points, count="+nPoints+"]");
+			return ("Roi[Points, count="+nPoints+", pos="+getPositionAsString()+"]");
 		else
-			return ("Roi[Point, x="+x+", y="+y+"]");
+			return ("Roi[Point, x="+x+", y="+y+", pos="+getPositionAsString()+"]");
 	}
 
 	/** @deprecated */

ij/gui/Roi.java

@@ -2213,6 +2213,17 @@ public void setPosition(int n) {
 	public int getPosition() {
 		return position;
 	}
+	
+	public String getPositionAsString() {
+		String position = "" + getPosition();
+		if (hasHyperStackPosition())
+			position =  getCPosition() +","+getZPosition()+","+ getTPosition();
+		if (position.equals("0"))
+			position = "none";
+		else if (position.equals(""+PointRoi.POINTWISE_POSITION))
+			position = "point-specific";
+		return position;
+	}
 
 	/** Sets the hyperstack position of this ROI. In an overlay, this
 	* ROI is only displayed when the hyperstack is at the specified position.
@@ -2584,7 +2595,7 @@ public int getPropertyCount() {
 	}
 
 	public String toString() {
-		return ("Roi["+getTypeAsString()+", x="+x+", y="+y+", width="+width+", height="+height+"]");
+		return ("Roi["+getTypeAsString()+", x="+x+", y="+y+", width="+width+", height="+height+", pos="+getPositionAsString()+"]");
 	}
 
 	/** Deprecated */

ij/gui/RoiProperties.java

@@ -87,13 +87,7 @@ public boolean showDialog() {
 			justification = troi.getJustification();
 			antialias = troi.getAntiAlias();
 		}
-		String position = ""+roi.getPosition();
-		if (roi.hasHyperStackPosition())
-			position =  roi.getCPosition() +","+roi.getZPosition()+","+ roi.getTPosition();
-		if (position.equals("0"))
-			position = "none";
-		else if (position.equals(""+PointRoi.POINTWISE_POSITION))
-			position = "point-specific";
+		String position = roi.getPositionAsString();			
 		String group = ""+roi.getGroup();
 		if (group.equals("0"))
 			group = "none";
@@ -312,7 +306,7 @@ else if (roi.getPosition() == 0)
 			listProperties(roi);
 		return true;
 	}
-	
+		
 	private void setPosition(Roi roi, String pos1, String pos2) {
 		if (pos1.equals(pos2))
 			return;

ij/plugin/filter/StackLabeler.java

@@ -218,7 +218,7 @@ else if (imp.getNSlices()>1)
 				frame = pos[1];
 		}
 		if (useOverlay) {
-			if (image==1) {
+			if (image==1 || previewing) {
 				overlay = new Overlay();
 				if (baseOverlay!=null) {
 					for (int i=0; i<baseOverlay.size(); i++)

release-notes.html

@@ -6,11 +6,17 @@
 <body>
 
 
-<li> <u>1.54p  17 February 2025</u>
+<li> <u>1.54q2  14 March 2025</u>
 <ul>
+<li> Thanks to Michael Schmid, fixed bug where <i>Image&gt;Stacks&gt;Label</i>
+produces a NullPointerException in "overlay" mode when previewing
+and the current stack slice is not the first one.
 <li> Thanks to Michael Schmid, fixed 1.54m9 <i>Analyze&gt;Plot Profile</i>
 regression where ImageProcessor.getLine() did not sample the
-correct points
+correct points.
+<li> Thanks to 'AndreC' and 'scouser27' fixed regression that caused point
+selections on hyperstacks to not be correctly added to overlays and the
+ROI Manager.
 </ul>
 
 <li> <u>1.54n  17 February 2025</u>