2020.09.16 (1.53e; Release version)

Jackson96969-colab · Sep 17, 2020 · 41330fa · 41330fa
1 parent 696e811
commit 41330fa
Show file tree

Hide file tree

Showing 5 changed files with 21 additions and 13 deletions.
diff --git a/ij/ImageJ.java b/ij/ImageJ.java
@@ -78,7 +78,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.53e";
-	public static final String BUILD = "";  //21
+	public static final String BUILD = "";  //23
 	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/Plot.java b/ij/gui/Plot.java
@@ -1958,8 +1958,8 @@ void makeMarginValues() {
 		int addHspace = (int)Tools.getNumberFromList(pp.frame.options, "addhspace="); //user-defined extra space
 		int addVspace = (int)Tools.getNumberFromList(pp.frame.options, "addvspace=");
 		leftMargin	 = sc(LEFT_MARGIN*marginScale + addHspace);
-		rightMargin	 = sc(RIGHT_MARGIN*marginScale + addHspace);
-		topMargin	 = sc(TOP_MARGIN*marginScale + addVspace);
+		rightMargin = sc(RIGHT_MARGIN*marginScale + addHspace);
+		topMargin = sc(TOP_MARGIN*marginScale + addVspace);
 		bottomMargin = sc(BOTTOM_MARGIN*marginScale + 2 + addVspace);
 		if(pp != null && pp.xLabel != null && pp.xLabel.getFont() != null){
 			float numberSize = font.getSize2D();

diff --git a/ij/io/Opener.java b/ij/io/Opener.java
@@ -950,7 +950,11 @@ public ImagePlus openZip(String path) {
 				imp = dcm;
 			} else {
 				zis.close();
-				IJ.error("Opener", "This ZIP archive does not appear to contain a \nTIFF (\".tif\") or DICOM (\".dcm\") file, or ROIs (\".roi\").");
+				String msg = "This ZIP archive does not contain a TIFF or DICOM file, or ROIs:\n   "+path;
+				if (silentMode)
+					IJ.log(msg);
+				else
+					IJ.error("Opener", msg);
 				return null;
 			}
 			zis.close();

diff --git a/ij/plugin/FolderOpener.java b/ij/plugin/FolderOpener.java
@@ -486,11 +486,10 @@ boolean showDialog() {
 			options = options.replace("open=", "dir=");
 			options = options.replace("file=", "filter=");
 			options =  options.replace("starting=","start=");
+			options =  options.replace("number=","count=");
 			options =  options.replace("increment=","inc=");
 			if (!options.equals(optionsOrig))
 				Macro.setOptions(options);
-			if (options.contains("number="))
-				this.nFiles = (int)Tools.getNumberFromList(options,"number=",0);
 			if (options.contains("convert_to_rgb"))
 				this.bitDepth = 24;
 		}
@@ -505,6 +504,7 @@ boolean showDialog() {
 		gd.setInsets(0,55,0);
 		gd.addMessage("enclose regex in parens", IJ.font10, Color.darkGray);
 		gd.addNumericField("Start:", this.start, 0, 6, "");
+		gd.addStringField("Count:", "---", 6);
 		gd.addNumericField("Inc:", this.increment, 0, 6, "");
 		gd.addNumericField("Scale:", this.scale, 0, 6, "%");
 		gd.addCheckbox("Sort names numerically", sortFileNames);
@@ -523,6 +523,10 @@ boolean showDialog() {
 			filter = "("+legacyRegex+")";			
 		gd.setSmartRecording(true);
 		this.start = (int)gd.getNextNumber();
+		String countStr = gd.getNextString();
+		double count = Tools.parseDouble(countStr);
+		if (!Double.isNaN(count))
+			nFiles = (int)count;
 		this.increment = (int)gd.getNextNumber();
 		if (this.increment<1)
 			this.increment = 1;

diff --git a/release-notes.html b/release-notes.html
@@ -3,12 +3,12 @@
 <link rel="stylesheet" href="../docs/ij.css" type="text/css"/>
 <title>Release Notes</title>
 </head>
-<body>x
+<body>
 
-<li> <u>1.53e21  12 September 2020</u>
+<li> <u>1.53e  16 September 2020</u>
 <ul>
 <li> Thanks to Michael Schmid, the color picker tool has
-a new icon and a new right click drop down menu.
+a new icon and a right click drop down menu.
 <li> The "Black background" option is no longer
 saved in the preferences file. Add
 setOption("BlackBackground",true) to Edit>Options>Startup
@@ -17,7 +17,7 @@
 <i>Edit&gt;Selection&gt;Add to Manager</i> command.
 <li> Thanks to Michael Ellis, added a module-info.java file,
 used by the Java Module System, to the ImageJ source.
-<li> Thanks to 'mkhapp', added the RoiManager.selected macro DOCUMENT
+<li> Thanks to 'mkhapp', added the RoiManager.selected macro
 function, which returns the number of selected ROIs in the
 ROI Manager
 (<a href="http://wsr.imagej.net/macros/SetGroupDemo.txt">example</a>).
@@ -26,12 +26,12 @@
 of the Color Picker to be opened.
 <li> Thanks to 'Ben', fixed a bug that caused the Table.get()
 macro function to return strings instead of numbers.
-<li>Thanks to Fred Damen and Michael chmid, fixed a bug
+<li>Thanks to Fred Damen and Michael Schmid, fixed a bug
 that caused the run("Copy to System") macro function to
 sometimes copy the wrong image to the system clipboard.
 <li>Thanks to Fred Damen, fixed a bug that caused unreliable
 zooming of images with selections when using the arrow keys
-and shift or control.
+while holding the shift or control key down.
 <li>Thanks to Fred Damen, fixed a bug that caused the
 img3=ImageCalculator.run(img1,img2,operation) method
 to return null if the 'operation' string did not contain
@@ -42,7 +42,7 @@
 <li> Thanks to Robert Svoboda, fixed a 1.53d regression on
 Windows that could cause the getDirectory() macro function
 to throw an exception or crash ImageJ.
-<li> Thanks to Stein Rorvik, fixed a 1.53d regression that caused
+<li> Thanks to Stein Rorvik, fixed a 1.53d regression that could cause
 the run("Image Sequence...",options) macro function to fail.
 </ul>