2024.11.29 (1.54m28; SetIJMenuBar option)

rasband · rasband · commit af2a85e5b564 · 2024-11-29T09:21:07.000-05:00
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.54m";
-	public static final String BUILD = "26";
+	public static final String BUILD = "28";
 	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/PolygonRoi.java b/ij/gui/PolygonRoi.java
@@ -1420,7 +1420,7 @@ else if (xpf!=null)
 	private boolean isTraced() {
 		if (type==TRACED_ROI)
 			return true;
-		else if (type!=POLYGON)
+		else if (type!=POLYGON || (this instanceof RotatedRectRoi))
 			return false;
 		else if (xp==null) {
 			if (xpf==null)
diff --git a/ij/gui/RotatedRectRoi.java b/ij/gui/RotatedRectRoi.java
@@ -14,7 +14,7 @@ public class RotatedRectRoi extends PolygonRoi {
 	private double rectWidth = DefaultRectWidth;
 
 	public RotatedRectRoi(double x1, double y1, double x2, double y2, double rectWidth) {
-		super(new float[4], new float[4], 4, FREEROI);
+		super(new float[4], new float[4], 4, POLYGON);
 		this.rectWidth = rectWidth;
 		makeRectangle(x1, y1, x2, y2);
 		state = NORMAL;
diff --git a/ij/macro/Functions.java b/ij/macro/Functions.java
@@ -4799,6 +4799,8 @@ else if (arg1.startsWith("calibrate")) {
 			ImageConverter.setDoScaling(true);
 		} else if (arg1.startsWith("mousewheel"))
 			Prefs.mouseWheelStackScrolling = state;
+		else if (arg1.startsWith("setijmenubar"))
+			Prefs.setIJMenuBar = state;
 		else
 			interp.error("Invalid option");
 	}
diff --git a/ij/plugin/CommandFinder.java b/ij/plugin/CommandFinder.java
@@ -636,7 +636,7 @@ private void closeWindow() {
 	}
 
 	public void windowActivated(WindowEvent e) {
-		if (IJ.isMacOSX() && frame != null)
+		if (IJ.isMacOSX() && frame != null && Prefs.setIJMenuBar)
 			frame.setMenuBar(Menus.getMenuBar());
 	}
 
diff --git a/ij/plugin/Options.java b/ij/plugin/Options.java
@@ -84,7 +84,12 @@ else if (divValue.equalsIgnoreCase("max"))
 			Prefs.doNotSaveWindowLocations = !gd.getNextBoolean();
 		Prefs.nonBlockingFilterDialogs = gd.getNextBoolean();
 		IJ.setDebugMode(gd.getNextBoolean());
-		//Prefs.modernMode = gd.getNextBoolean();
+		if (IJ.recording() && IJ.isMacOSX()) {
+			if (Recorder.scriptMode())
+				Recorder.recordCall("Prefs.setIJMenuBar = "+Prefs.setIJMenuBar+";");
+			else
+				Recorder.recordString("setOption(\"setIJMenuBar\", "+Prefs.setIJMenuBar+");\n");
+		}
 	}
 
 	void lineWidth() {
diff --git a/ij/plugin/frame/Recorder.java b/ij/plugin/frame/Recorder.java
@@ -1023,7 +1023,7 @@ public static void setBlackBackground() {
 	
 	/** Override windowActivated in PlugInFrame. */
 	public void windowActivated(WindowEvent e) {
-		if (IJ.isMacintosh() && !IJ.isJava17())
+		if (IJ.isMacintosh() && !IJ.isJava17() && Prefs.setIJMenuBar)
 			this.setMenuBar(Menus.getMenuBar());
 		WindowManager.setWindow(this);
 	}
diff --git a/release-notes.html b/release-notes.html
@@ -6,8 +6,11 @@
 <body>
 
 
-<li> <u>1.54m26  18 November 2024</u>
+<li> <u>1.54m28  29 November 2024</u>
 <ul>
+<li> Thanks to 'Jerry1144', added the setOption("setIJMenuBar",boolean)
+macro function
+(<a href="http://wsr.imagej.net/macros/MacWindowSwitchingDemo.ijm">example</a>). DOC 
 <li> Thanks to Kenneth Sloan, added the Roi.setMinStrokeWidth(minStrokeWidth)
 macro function and Java method that you can use to specify a
 minimum scaled stroke width
@@ -45,6 +48,8 @@
 <li> Thanks to 'scouser27', fixed bug with ROI Manager
 "Multi Measure" command when "Measure all n slices" was
 not checked and "One row per slice" was.
+<li> Thanks to 'scouser27', fixed a bug with how perimeters
+of rotated rectangle selections are calculated.
 </ul>
 
 <li> <u>1.54k  15 September 2024</u>

Original file line number	Diff line number	Diff line change
`@@ -4799,6 +4799,8 @@ else if (arg1.startsWith("calibrate")) {`
`4799`	`4799`	`ImageConverter.setDoScaling(true);`
`4800`	`4800`	`} else if (arg1.startsWith("mousewheel"))`
`4801`	`4801`	`Prefs.mouseWheelStackScrolling = state;`
	`4802`	`+ else if (arg1.startsWith("setijmenubar"))`
	`4803`	`+ Prefs.setIJMenuBar = state;`
`4802`	`4804`	`else`
`4803`	`4805`	`interp.error("Invalid option");`
`4804`	`4806`	`}`
Original file line number	Diff line number	Diff line change
`@@ -636,7 +636,7 @@ private void closeWindow() {`
`636`	`636`	`}`
`637`	`637`
`638`	`638`	`public void windowActivated(WindowEvent e) {`
`639`		`- if (IJ.isMacOSX() && frame != null)`
	`639`	`+ if (IJ.isMacOSX() && frame != null && Prefs.setIJMenuBar)`
`640`	`640`	`frame.setMenuBar(Menus.getMenuBar());`
`641`	`641`	`}`
`642`	`642`
Original file line number	Diff line number	Diff line change
`@@ -1023,7 +1023,7 @@ public static void setBlackBackground() {`
`1023`	`1023`
`1024`	`1024`	`/** Override windowActivated in PlugInFrame. */`
`1025`	`1025`	`public void windowActivated(WindowEvent e) {`
`1026`		`- if (IJ.isMacintosh() && !IJ.isJava17())`
	`1026`	`+ if (IJ.isMacintosh() && !IJ.isJava17() && Prefs.setIJMenuBar)`
`1027`	`1027`	`this.setMenuBar(Menus.getMenuBar());`
`1028`	`1028`	`WindowManager.setWindow(this);`
`1029`	`1029`	`}`