2025.10.02 (1.54s6; Macro error messages)

rasband · rasband · commit 22920b470be6 · 2025-10-02T11:40:01.000-04:00
diff --git a/ij/ImageJ.java b/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.54r";
-	public static final String BUILD = "";  //8
+	public static final String VERSION = "1.54s";
+	public static final String BUILD = "6";
 	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);
diff --git a/ij/gui/ImageCanvas.java b/ij/gui/ImageCanvas.java
@@ -342,7 +342,7 @@ private void drawOverlay(Overlay overlay, Graphics g) {
 					else if (t==0)
 						t = position;
 				}
-				//IJ.log("drawOverlay: i="+i+", pos="+roi.getPosition()+" "+c+" "+z+" "+t);
+				//IJ.log("drawOverlay: i="+i+", pos="+roi.getPosition()+" "+c+" "+z+" "+t+" "+roiManagerShowAllMode);
 				if (((c==0||c==channel) && (z==0||z==slice) && (t==0||t==frame)) || roiManagerShowAllMode || position == PointRoi.POINTWISE_POSITION)
 					drawRoi(g, roi, drawLabels?i+LIST_OFFSET:-1);
 			} else {
diff --git a/ij/macro/Functions.java b/ij/macro/Functions.java
@@ -239,7 +239,7 @@ final double getFunctionValue(int type) {
 			case MATCHES: value = matches(null); break;
 			case GET_STRING_WIDTH: value = getStringWidth(); break;
 			case FIT: value = fit(); break;
-			case OVERLAY: value = overlay(); break;
+			case OVERLAY: value = doOverlay(); break;
 			case SELECTION_CONTAINS: value = selectionContains(); break;
 			case PLOT: value = doPlot(); break;
 			default:
@@ -6776,7 +6776,7 @@ private void renameResults() {
 			IJ.renameResults(arg1);
 	}
 
-	double overlay() {
+	double doOverlay() {
 		interp.getToken();
 		if (interp.token!='.')
 			interp.error("'.' expected");
diff --git a/ij/macro/Interpreter.java b/ij/macro/Interpreter.java
@@ -1354,7 +1354,7 @@ final void getComma() {
 		}
 	}
 
-	void error (String message) {
+	void error(String message) {
 		errorMessage = message;
 		if (ignoreErrors)
 			return;
@@ -1373,9 +1373,23 @@ void error (String message) {
 			instance = null;
 		if (showMessage && message!=null) {
 			String line = getErrorLine();
+			String originalLine = line;
 			done = true;
-			if (line.length()>120)
-				line = line.substring(0,119)+"...";			
+			int max = 90;
+			int len = line.length();
+			if (len>max) {
+				StringBuilder sb = new StringBuilder(len+50);
+				int count = 0;
+				for (int i=0; i<len; i++){
+					sb.append(line.charAt(i));
+					count++;
+					if (count>=max && i<len-7) {
+						sb.append("\n  ");
+						count = 0;
+					}
+				}
+				line = sb.toString();
+			}
 			Frame f = WindowManager.getFrame("Debug");			
 			TextPanel panel = null;
 			if (showVariables && f!=null && (f instanceof TextWindow)) { //clear previous content
@@ -1398,7 +1412,7 @@ void error (String message) {
 				TextWindow debugWindow = (TextWindow)f;
 				debugWindow.append("\n---\t\t---\nError:\t\t" + message + " in line "+lineNumber + ":");
 				debugWindow.append(calledFrom + "\t\t");	
-				debugWindow.append("\t\t"+line);
+				debugWindow.append("\t\t"+originalLine);
 			}			
 			throw new RuntimeException(Macro.MACRO_CANCELED);
 		}
diff --git a/ij/plugin/filter/ParticleAnalyzer.java b/ij/plugin/filter/ParticleAnalyzer.java
@@ -68,7 +68,7 @@ public class ParticleAnalyzer implements PlugInFilter, Measurements {
 	/** Display image containing binary masks of measured particles. */
 	public static final int SHOW_MASKS = 4096;
 
-	/** Use 4-connected particle tracing. */
+	/** Use 4-connected particle tracing. In a macro, add "four" to the options string. */
 	public static final int FOUR_CONNECTED = 8192;
 
 	/** Replace original image with masks. */
diff --git a/release-notes.html b/release-notes.html
@@ -5,6 +5,13 @@
 </head>
 <body>
 
+<li> <u>1.54s6 2 October 2025</u>
+<ul>
+<li> Thanks to Bram van den Broek, macro error messages longer
+than 90 characters are displayed on multiple lines and the full
+message is displayed in the Debug window.
+</ul>
+
 <li> <u>1.54r 25 September 2025</u>
 <ul>
 <li> The <i>File&gt;New&gt;Text Window</i> command now

Original file line number	Diff line number	Diff line change
`@@ -342,7 +342,7 @@ private void drawOverlay(Overlay overlay, Graphics g) {`
`342`	`342`	`else if (t==0)`
`343`	`343`	`t = position;`
`344`	`344`	`}`
`345`		`- //IJ.log("drawOverlay: i="+i+", pos="+roi.getPosition()+" "+c+" "+z+" "+t);`
	`345`	`+ //IJ.log("drawOverlay: i="+i+", pos="+roi.getPosition()+" "+c+" "+z+" "+t+" "+roiManagerShowAllMode);`
`346`	`346`	`if (((c==0\|\|c==channel) && (z==0\|\|z==slice) && (t==0\|\|t==frame)) \|\| roiManagerShowAllMode \|\| position == PointRoi.POINTWISE_POSITION)`
`347`	`347`	`drawRoi(g, roi, drawLabels?i+LIST_OFFSET:-1);`
`348`	`348`	`} else {`