2023.07.10 (1.54g4; ROI Manager options)

imagej · Jul 10, 2023 · f491399 · f491399
1 parent 5addb75
commit f491399
Show file tree

Hide file tree

Showing 8 changed files with 21 additions and 11 deletions.
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.54f";
-	public static final String BUILD = ""; //34
+	public static final String VERSION = "1.54g";
+	public static final String BUILD = "4";
 	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/Menus.java b/ij/Menus.java
@@ -687,7 +687,7 @@ void installMacro(String name) {
 			command = command.substring(0, command.length()-3); //remove ".js" or ".py"
 		else
 			command = command.substring(0, command.length()-4); //remove ".txt", ".ijm" or ".bsh"
-		command.trim();
+		command = command.trim();
 		if (pluginsTable.get(command)!=null) // duplicate command?
 			command = command + " Macro";
 		MenuItem item = new MenuItem(command);
@@ -1169,7 +1169,7 @@ public void installUserPlugin(String className, boolean force) {
 			command = className.substring(slashIndex+1);
 		}
 		command = command.replace('_',' ');
-		command.trim();
+		command = command.trim();
 		boolean itemExists = (pluginsTable.get(command)!=null);
 		if(force && itemExists)
 			return;

diff --git a/ij/Prefs.java b/ij/Prefs.java
@@ -563,7 +563,7 @@ static void loadOptions() {
 		useInvertingLut = (options&USE_INVERTING_LUT)!=0;
 		intelByteOrder = (options&INTEL_BYTE_ORDER)!=0;
 		noBorder = (options&NO_BORDER)!=0;
-		showAllSliceOnly = (options&SHOW_ALL_SLICE_ONLY)!=0;
+		//showAllSliceOnly = (options&SHOW_ALL_SLICE_ONLY)!=0;
 		copyColumnHeaders = (options&COPY_HEADERS)!=0;
 		noRowNumbers = (options&NO_ROW_NUMBERS)!=0;
 		moveToMisc = (options&MOVE_TO_MISC)!=0;

diff --git a/ij/macro/Functions.java b/ij/macro/Functions.java
@@ -3362,6 +3362,8 @@ void close() {
 							rm.close();
 						}
 					}
+					if (unUpdatedTable!=null && pattern.equals(unUpdatedTable.getTitle()))
+						unUpdatedTable = null;
 				}
 			}
 

diff --git a/ij/plugin/DICOM.java b/ij/plugin/DICOM.java
@@ -1192,7 +1192,7 @@ Properties getDictionary() {
 		"00181147=CSField of View Shape",
 		"00181149=ISField of View Dimensions(s)",
 		"00181150=ISExposure Time",
-		"00181151=ISX-ray Tube Current",
+		"00181151=ISX-Ray Tube Current",
 		"00181152=ISExposure",
 		"00181153=ISExposure in uAs",
 		"00181154=DSAverage Pulse Width",
@@ -1358,6 +1358,8 @@ Properties getDictionary() {
 		"00187062=LTExposure Control Mode Description",
 		"00187064=CSExposure Status",
 		"00187065=DSPhototimer Setting",
+		"00188151=DSX-Ray Tube Current in µA",
+		"00189330=DSX-Ray Tube Current in mA",
 
 		"0020000D=UIStudy Instance UID",
 		"0020000E=UISeries Instance UID",

diff --git a/ij/plugin/filter/Rotator.java b/ij/plugin/filter/Rotator.java
@@ -140,7 +140,7 @@ public int showDialog(ImagePlus imp, String command, PlugInFilterRunner pfr) {
 		String macroOptions = Macro.getOptions();
 		if (macroOptions!=null) {
 			if (macroOptions.indexOf(" interpolate")!=-1)
-				macroOptions.replaceAll(" interpolate", " interpolation=Bilinear");
+				macroOptions = macroOptions.replaceAll(" interpolate", " interpolation=Bilinear");
 			else if (macroOptions.indexOf(" interpolation=")==-1)
 				macroOptions = macroOptions+" interpolation=None";
 			Macro.setOptions(macroOptions);

diff --git a/ij/util/Java2.java b/ij/util/Java2.java
@@ -19,7 +19,6 @@ public static void setAntialiased(Graphics g, boolean antialiased) {
 	}
 
 	public static void setAntialiasedText(Graphics g, boolean antialiasedText) {
-		if (IJ.debugMode) IJ.log("setAntialiasedText: "+antialiasedText);
 		Graphics2D g2d = (Graphics2D)g;
 		if (antialiasedText) {
 			//if (IJ.isMacOSX())

diff --git a/release-notes.html b/release-notes.html
@@ -5,9 +5,17 @@
 </head>
 <body>
 
-<li> <u>1.54f  29 June 2023</u>
+<li> <u>1.54g4  10 July 2023</u>
 <ul>
+<li> Thanks to Robert Baer, the “Associate ’Show All’ ROIs with slices”
+option in the ROI Manager’s More&gt;&gt;Options dialog is now always
+enabled when ImageJ starts up.
+<li> Thanks to 'Phiir42', fixed bug with closed tables reopening after
+a macro finishes.
+</ul>
 
+<li> <u>1.54f  29 June 2023</u>
+<ul>
 <li> Improved recording of the <i>Analyze&gt;Tools&gt;Scale Bar</i> command.
 <li> Thanks to Stephen Cross, added the <i>Image&gt;Overlay&gt;Toggle Overlay</i>
 command.
@@ -44,9 +52,8 @@
 <li> Thanks to Herbie Gluender and Michael Schmid, fixed a bug with the
 Array.findMaxima() macro function that occurred when the first array element
 was NaN.
-<li> Thanks to Michael Cammer, fixed a 1.54e <i>Analyze&gt;Tools&gt;Scale BAR</i>
+<li> Thanks to Michael Cammer, fixed a 1.54e <i>Analyze&gt;Tools&gt;Scale Bar</i>
 regression with images that are spatially calibrated and have an ROI. 
-
 </ul>
 
 <li> <u>1.54e  4 June 2023</u>