2023.12.15 (1.54h; Release version)

imagej · Dec 15, 2023 · 7c00dc5 · 7c00dc5
1 parent bf22ede
commit 7c00dc5
Show file tree

Hide file tree

Showing 5 changed files with 14 additions and 12 deletions.
diff --git a/ij/ImageJ.java b/ij/ImageJ.java
@@ -79,7 +79,7 @@ public class ImageJ extends Frame implements ActionListener,
 
 	/** Plugins should call IJ.getVersion() or IJ.getFullVersion() to get the version string. */
 	public static final String VERSION = "1.54h";
-	public static final String BUILD = "20";
+	public static final String BUILD = ""; //21
 	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/YesNoCancelDialog.java b/ij/gui/YesNoCancelDialog.java
@@ -16,6 +16,10 @@ public YesNoCancelDialog(Frame parent, String title, String msg) {
 
 	public YesNoCancelDialog(Frame parent, String title, String msg, String yesLabel, String noLabel) {
 		super(parent, title, true);
+		//if (msg.contains("[NON_BLOCKING]")) {
+		//	setModal(false);
+		//	msg = msg.replace("[NON_BLOCKING]", "");
+		//}
 		setLayout(new BorderLayout());
 		Panel panel = new Panel();
 		panel.setLayout(new FlowLayout(FlowLayout.LEFT, 10, 10));

diff --git a/ij/macro/Functions.java b/ij/macro/Functions.java
@@ -4110,8 +4110,7 @@ String doDialog() {
 				interp.getParens();
 				gd.addToSameRow();
 			} else if (name.equals("enableYesNoCancel")) {
-				interp.getParens();
-				gd.enableYesNoCancel(" Yes ", " No ");
+				gd.enableYesNoCancel(getFirstString(), getLastString());
 			} else if (name.equals("setLocation")) {
 				gd.setLocation((int)getFirstArg(), (int)getLastArg());
 			} else if (name.equals("getLocation")) {
@@ -4152,9 +4151,9 @@ String doDialog() {
 				interp.getParens();
 				String result = "no";
 				if (gd.wasCanceled())
-					 result = "cancel";
-				  else if (gd.wasOKed())
-					 result = "yes";
+					result = "cancel";
+				else if (gd.wasOKed())
+					result = "yes";
 				return result;
 			} else
 				interp.error("Unrecognized Dialog function "+name);

diff --git a/ij/plugin/URLOpener.java b/ij/plugin/URLOpener.java
@@ -21,7 +21,6 @@ public class URLOpener implements PlugIn {
 		a file name, opens the image with that name from the 'images.location'
 		URL in IJ_Props.txt. If it is blank, prompts for an image
 		URL and open the specified image.
-		http://co3d-icc-review-progqi.oss.eu-west-0.prod-cloud-ocb.orange-business.com/gaston.jpeg?AWSAccessKeyId=S3BC6CQHTB5IZNVBAR8P&Expires=1702508400&Signature=%2BjZBuG6gArIByiyDOVNZvnFnqtg%3D
 	*/
 	public void run(String urlOrName) {
 		if (IJ.debugMode) IJ.log("URLOpener.run: "+urlOrName);

diff --git a/release-notes.html b/release-notes.html
@@ -5,10 +5,10 @@
 </head>
 <body>
 
-<li> <u>1.54h20  14 December 2023</u>
+<li> <u>1.54h  15 December 2023</u>
 <ul>
 <li> Thanks to Michael Schmid, improved the fidelity of
-the RGB to indexed color conversion done by
+the RGB to indexed color conversion done by the
 <i>Image&gt;Type&gt;8-bit Color</i> command.
 <li> Thanks to Michael Ellis, added the ImageListenerAdapter
 class, which supports notification when an ImagePlus
@@ -18,16 +18,16 @@
 when its running in batch mode.
 <li> Thanks to Philippe Carl, added the Dialog.enableYesNoCancel
 and Dialog.getYesNoCancel macro functions
-(<a href="http://wsr.imagej.net/macros/YesNoCancelDialog.ijm">example</a>,
+(<a href="http://wsr.imagej.net/macros/YesNoCancelDialog.ijm">example</a>).
 <li> Thanks to Michael Schmid, the Plot.update() macro function
 now works for plots that are not under construction.
 <li> Thanks to Stein Rorvik, fixed bug where use of a modifier key
 in the text editor caused isKeyDown() calls to be stuck
 returning 'true' for that modifier.
 <li> Thanks to 'IztokD', fixed bugs with the Plot.getValues() macro
-functio not working in batch mode.
+function not working in batch mode.
 <li> Thanks to 'Fijipuff', fixed bug with making montages of multi-channel 
-COMPOSITE mode images.
+"Composite" mode images.
 <li> Thanks to Michael Schmid, fixed exceptions that occurred 
 with Plot.addLabel() and with the <i>Image&gt;Color&gt;Show LUT</i>
 command.