2021.07.06 (1.53k19; GenericDialog.addButton)

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.53k";
-	public static final String BUILD = "16";
+	public static final String BUILD = "";  //19
 	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

@@ -186,7 +186,7 @@ public class Prefs {
 	public static boolean supportMacroUndo;
 	/** Use NonBlockingGenericDialogs in filters */	
 	public static boolean nonBlockingFilterDialogs;
-	/** Use v=65535-v to invert 16-bit images (more to come) */	
+	/** Currently not used */	
 	public static boolean modernMode;
 	//Save location of moved image windows */	
 	//public static boolean saveImageLocation = true;

ij/gui/GenericDialog.java

@@ -372,6 +372,26 @@ public void addFileField(String label, String defaultPath, int columns) {
 			saveLabel(panel, label);
 	}
 
+	/**
+	 * Add button to the dialog
+	 * @param label button label
+	 * @param listener listener to handle the action when pressing the button
+	*/
+	public void addButton(String label, ActionListener listener) {
+		if (GraphicsEnvironment.isHeadless())
+			return;
+		Button button = new Button(label);
+		button.addActionListener(listener);
+		button.addKeyListener(this);		
+		GridBagLayout layout = (GridBagLayout)getLayout();
+		Panel panel = new Panel();
+		addPanel(panel);
+		GridBagConstraints constraints = layout.getConstraints(panel);
+		remove(panel);
+		layout.setConstraints(button, constraints);
+		add(button);
+	}
+
 	/** Adds a popup menu that lists the currently open images.
 	 * Call getNextImage() to retrieve the selected
 	 * image. Based on the addImageChoice()

ij/gui/Toolbar.java

@@ -5,7 +5,11 @@
 import java.awt.image.BufferedImage;
 import javax.imageio.ImageIO;
 import java.io.File;
-import java.util.*;
+import java.util.Timer;
+import java.util.Hashtable;
+import java.util.TimerTask;
+import java.util.Arrays;
+import java.util.Locale;
 import ij.*;
 import ij.plugin.frame.*;
 import ij.plugin.MacroInstaller;
@@ -1271,7 +1275,7 @@ public void mousePressed(final MouseEvent e) {
 
 		if (!isRightClick && longClickDelay>0) {
 			if (pressTimer==null)
-				pressTimer = new java.util.Timer();			
+				pressTimer = new Timer();			
 			pressTimer.schedule(new TimerTask() {
 				public void run() {
 					if (pressTimer != null) {

ij/plugin/Options.java

@@ -48,7 +48,7 @@ void miscOptions() {
 			gd.addCheckbox("Save window locations", !Prefs.doNotSaveWindowLocations);
 		gd.addCheckbox("Non-blocking filter dialogs", Prefs.nonBlockingFilterDialogs);
 		gd.addCheckbox("Debug mode", IJ.debugMode);
-		gd.addCheckbox("Modern mode", Prefs.modernMode);
+		//gd.addCheckbox("Modern mode", Prefs.modernMode);
 		gd.addHelp(IJ.URL+"/docs/menus/edit.html#misc");
 		gd.showDialog();
 		if (gd.wasCanceled())
@@ -84,7 +84,7 @@ else if (divValue.equalsIgnoreCase("max"))
 			Prefs.doNotSaveWindowLocations = !gd.getNextBoolean();
 		Prefs.nonBlockingFilterDialogs = gd.getNextBoolean();
 		IJ.setDebugMode(gd.getNextBoolean());
-		Prefs.modernMode = gd.getNextBoolean();
+		//Prefs.modernMode = gd.getNextBoolean();
 	}
 
 	void lineWidth() {

ij/plugin/filter/Filters.java

@@ -20,18 +20,14 @@ public int setup(String arg, ImagePlus imp) {
 		this.imp = imp;
 		if (imp!=null) {
 			Roi roi = imp.getRoi();
-			if (Prefs.modernMode && imp.getType()==ImagePlus.GRAY16 && arg.equals("invert")) {
+			if (imp.getType()==ImagePlus.GRAY16 && arg.equals("invert")) {
 				imp.resetRoi();
 				roi = null;
 			}
 			if (roi!=null && !roi.isArea())
 				noRoi = true;
 		}
 		int flags = IJ.setupDialog(imp, DOES_ALL-DOES_8C+SUPPORTS_MASKING);
-		if ((flags&PlugInFilter.DOES_STACKS)!=0 && imp.getType()==ImagePlus.GRAY16 && imp.getStackSize()>1 && !Prefs.modernMode && arg.equals("invert")) {
-				invert16BitStack(imp);
-				return DONE;
-		}
 		return flags;
 	}
 
@@ -43,7 +39,7 @@ public void run(ImageProcessor ip) {
 		if (arg.equals("invert")) {
 	 		ip.invert();
 	 		slice++;
-	 		if (Prefs.modernMode && imp.getBitDepth()==16 && imp.getStackSize()>1 && slice==imp.getStackSize())
+	 		if (imp.getBitDepth()==16 && imp.getStackSize()>1 && slice==imp.getStackSize())
 	 			imp.resetDisplayRange();
 	 		return;
 	 	}
@@ -94,28 +90,7 @@ public void run(ImageProcessor ip) {
 	 	}
 
 	}
-	
-	void invert16BitStack(ImagePlus imp) {
-		imp.deleteRoi();
-		imp.getCalibration().disableDensityCalibration();
-		ImageStatistics stats = new StackStatistics(imp);
-		ImageStack stack = imp.getStack();
-		int nslices = stack.size();
-		int min=(int)stats.min, range=(int)(stats.max-stats.min);
-		int n = imp.getWidth()*imp.getHeight();
-		for (int slice=1; slice<=nslices; slice++) {
-			ImageProcessor ip = stack.getProcessor(slice);
-			short[] pixels = (short[])ip.getPixels();
-			for (int i=0; i<n; i++) {
-				int before = pixels[i]&0xffff;
-				pixels[i] = (short)(range-((pixels[i]&0xffff)-min));
-			}
-		}
-		imp.setStack(null, stack);
-		imp.setDisplayRange(0, range);
-		imp.updateAndDraw();
-	}
-	
+		
 	/** Returns the default standard deviation used by Process/Noise/Add Specified Noise. */
 	public static double getSD() {
 		return sd;

ij/process/ShortProcessor.java

@@ -567,18 +567,13 @@ private void process(int op, double value) {
 			}
 		}
     }
-
+    
 	public void invert() {
-		if (ij.Prefs.modernMode)
-			invert(65536);
-		else {
-			resetMinAndMax();
-			process(INVERT, 0.0);
-		}
-	}
-	
-	public void invert(int range) {
-		setMinAndMax(0, 65535);
+		int range = 65536;
+		int defaultRange = ij.ImagePlus.getDefault16bitRange();
+		if (defaultRange>0 && !isSigned16Bit())
+			range = (int)Math.pow(2,defaultRange);
+		setMinAndMax(0, range-1);
 		process(INVERT, 0.0);
 		resetMinAndMax();
 	}

plugins/MacAdapter9.class

@@ -5,24 +5,28 @@
 </head>
 <body>
 
-<li> <u>1.53k16 3 July 2021</u>
+<li> <u>1.53 5 July 2021</u>
 <ul>
-<li> Thanks Mike Nelson, added the "Modern mode" option to
-the <i>Edit&gt;Options&gt;Misc</i> dialog. 16-bit images are
-inverted using <i>v=65535-v</i> When this option is enabled.
+<li> Thanks Mike Nelson, 16-bit images are
+inverted using the full pixel value range (0-65535) or, if set,
+using the "Unsigned 16-bit range" in the "Set" option of the
+<i>Image&gt;Adjust&gt;Brightness/Contrast</i> dialog.
 <li> Thanks to Alan Brooks, added the macOS-specific
-MacAdapter9 plugin, which supports drag and drop on the
-ImageJ.app and the "About ImageJ" command on Java 9 or
-later.
+MacAdapter9 plugin, which, on Java 9 or later,
+supports drag and drop on the ImageJ.app and the
+"About ImageJ" command.
 <li> Thanks to Romain Guiet, the ROI Manager's
-“Associate ‘Show All’ ROIs with slices” option is
+"Associate 'Show All' ROIs with slices" option is
 now enabled by default.
 <li> Thanks to Gilles Carpentier, the particle analyzer now assumes
 the threshold is 255 unless "Black background" is not set,
 the image does not have an inverted LUT and fewer than
 half the pixels have a value of zero, in which case
 the threshold is set to zero.
-<li> Thanks to 'pdd2110', added the Property.setSliceLabel(label) method. DOCUMENT
+<li> Thanks to 'pdd2110', added the Property.setSliceLabel(label)
+macro function. DOCUMENT
+<li> Thanks to 'John D.', added the GenericDialog.addButton() method
+(<a href="http://wsr.imagej.net/plugins/Button_Example.java">example</a>).
 <li> Thanks to 'Oodegard', fixed a bug that caused the
 "Auto-next slice" option of the point tool to not
 work as expected with hyperstacks.