2020.08.30 (1.53e8; Added module-info.java)

Author: rasband

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 = "4";
+	public static final String BUILD = "8";
 	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/Prefs.java

@@ -72,7 +72,7 @@ public class Prefs {
 	/** Open images at 100% magnification*/
 	public static boolean open100Percent;
 	/** Backgound is black in binary images*/
-	public static boolean blackBackground;
+	public static boolean blackBackground = true;
 	/** Use JFileChooser instead of FileDialog to open and save files. */
 	public static boolean useJFileChooser;
 	/** Color to grayscale conversion is weighted (0.299, 0.587, 0.114) if the variable is true. */
@@ -491,7 +491,7 @@ static void loadOptions() {
 		antialiasedText = false;
 		interpolateScaledImages = (options&INTERPOLATE)!=0;
 		open100Percent = (options&ONE_HUNDRED_PERCENT)!=0;
-		blackBackground = (options&BLACK_BACKGROUND)!=0;
+		//blackBackground = (options&BLACK_BACKGROUND)!=0;
 		useJFileChooser = (options&JFILE_CHOOSER)!=0;
 		weightedColor = (options&WEIGHTED)!=0;
 		if (weightedColor)

ij/macro/Functions.java

@@ -7811,6 +7811,9 @@ private Variable doRoiManager() {
 		if (name.equals("size")) {
 			interp.getParens();
 			return new Variable(rm.getCount());
+		} else if (name.equals("selected")) {
+			interp.getParens();
+			return new Variable(rm.selected());
 		} else if (name.equals("select")) {
 			rm.select((int)getArg());
 			return null;

ij/macro/MacroRunner.java

@@ -37,8 +37,7 @@ public MacroRunner(String macro, Editor editor) {
 		thread.start();
 	}
 
-	/** Create a new object that interprets macro source in a 
-		separate thread, and also passing a string argument. */
+	/** Interprets macro source in a separate thread using a string argument. */
 	public MacroRunner(String macro, String argument) {
 		this.macro = macro;
 		this.argument = argument;
@@ -47,7 +46,7 @@ public MacroRunner(String macro, String argument) {
 		thread.start();
 	}
 
-	/** Create a new object that interprets a macro file using a separate thread. */
+	/** Interprets a macro file in a separate thread. */
 	public MacroRunner(File file) {
 		int size = (int)file.length();
 		if (size<=0)
@@ -74,12 +73,12 @@ public MacroRunner(File file) {
 		thread.start();
 	}
 
-	/** Create a new object that runs a tokenized macro in a separate thread. */
+	/** Runs a tokenized macro in a separate thread. */
 	public MacroRunner(Program pgm, int address, String name) {
 		this(pgm, address, name, (String)null);
 	}
 
-	/** Create a new object that runs a tokenized macro in a separate thread,
+	/** Runs a tokenized macro in a separate thread,
 		passing a string argument. */
 	public MacroRunner(Program pgm, int address, String name, String argument) {
 		this.pgm = pgm;
@@ -91,7 +90,7 @@ public MacroRunner(Program pgm, int address, String name, String argument) {
 		thread.start();
 	}
 
-	/** Create a new object that runs a tokenized macro in debug mode if 'editor' is not null. */
+	/** Runs a tokenized macro in debug mode if 'editor' is not null. */
 	public MacroRunner(Program pgm, int address, String name, Editor editor) {
 		this.pgm = pgm;
 		this.address = address;
@@ -129,6 +128,7 @@ public Thread getThread() {
 		return thread;
 	}
 
+	/** Used to run the macro code in 'macro' on a separate thread. */
 	public void run() {
 		Interpreter interp = new Interpreter();
 		interp.argument = argument;

ij/plugin/PointToolOptions.java

@@ -136,7 +136,7 @@ public boolean dialogItemChanged(GenericDialog gd, AWTEvent e) {
 		Prefs.showAllPoints = showAllPoints;
 		if (multipointTool) {
 			int counter = gd.getNextChoiceIndex();
-			if (counter!=getCounter()) {
+			if (counter==0 || counter!=getCounter()) {
 				setCounter(counter);
 				redraw = true;
 			}

ij/plugin/frame/Editor.java

@@ -27,6 +27,7 @@ public class Editor extends PlugInFrame implements ActionListener, ItemListener,
 		"importPackage(Packages.ij.process);"+
 		"importPackage(Packages.ij.measure);"+
 		"importPackage(Packages.ij.util);"+
+		"importPackage(Packages.ij.macro);"+
 		"importPackage(Packages.ij.plugin);"+
 		"importPackage(Packages.ij.io);"+
 		"importPackage(Packages.ij.plugin.filter);"+

ij/plugin/frame/RoiManager.java

@@ -601,8 +601,8 @@ boolean delete(boolean replacing) {
 			}
 		}
 		ImagePlus imp = WindowManager.getCurrentImage();
-		if (count>1 && index.length==1 && imp!=null)
-			imp.deleteRoi();
+		//if (count>1 && index.length==1 && imp!=null)
+		//	imp.deleteRoi();
 		updateShowAll();
 		if (record())
 			Recorder.record("roiManager", "Delete");
@@ -1601,7 +1601,7 @@ private void combine() {
 		if (imp==null)
 			return;
 		Roi[] rois = getSelectedRoisAsArray();
-		if (rois.length==1) {
+		if (rois.length==1 && !IJ.isMacro()) {
 			error("More than one item must be selected, or none");
 			return;
 		}
@@ -1620,6 +1620,13 @@ private int countPointRois(Roi[] rois) {
 	}
 
 	private void combineRois(ImagePlus imp, Roi[] rois) {
+		if (rois.length==1) {
+		    Roi roi2 = (Roi)rois[0].clone();
+		    roi2.setPosition(0);
+		    roi2.setGroup(0);
+			imp.setRoi(roi2);
+			return;
+		}
 		IJ.resetEscape();
 		ShapeRoi s1=null, s2=null;
 		for (int i=0; i<rois.length; i++) {
@@ -2078,6 +2085,11 @@ public int getCount() {
 		return listModel!=null?listModel.getSize():0;
 	}
 
+	/** Returns the count of selected ROIs. */
+	public int selected() {
+		return getSelectedIndexes().length;
+	}
+
 	/** Returns the index of the specified Roi, or -1 if it is not found. */
     public int getRoiIndex(Roi roi) {
 		int n = getCount();

module-info.java

@@ -0,0 +1,18 @@
+module ij {
+   requires java.desktop;
+	requires java.rmi;
+   requires java.compiler;
+   requires java.scripting;
+   exports ij;
+   exports ij.gui;
+   exports ij.io;
+   exports ij.macro;
+   exports ij.measure;
+   exports ij.plugin;
+   exports ij.plugin.filter;
+   exports ij.plugin.frame;
+   exports ij.plugin.tool;
+   exports ij.process;
+   exports ij.text;
+   exports ij.util;
+}

release-notes.html

@@ -5,14 +5,27 @@
 </head>
 <body>x
 
-<li> <u>1.53e4  23 August 2020</u>
+<li> <u>1.53e8  30 August 2020</u>
 <ul>
+<li> The "Black background" option is set 'true' on startup and
+is not saved in the preferences file. Add
+setOption("BlackBackground", false) to Edit>Options>Startup
+to have it set to 'false' on startup.
 <li> Thanks to Kees Straatman, improved recording of the
 <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
+function, which returns the number of selected ROIs in the
+ROI Manager
+(<a href="http://wsr.imagej.net/macros/SetGroupDemo.txt">example</a>).
 <li> Thanks to Philippe Carl, fixed a bug that allowed multiple copies
 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 Martin Hohne, fixed a 1.53c regression that caused
+the Counter popup menu in the Point Tool options Dialog
+to not work as expected .after switching to a different image.
 </ul>
 
 <li> <u>1.53d  20 August 2020</u>