2024.06.12 (1.54j; Release version)

imagej · Jun 13, 2024 · fc8c05e · fc8c05e
1 parent 6f6e828
commit fc8c05e
Show file tree

Hide file tree

Showing 6 changed files with 44 additions and 13 deletions.
diff --git a/functions.html b/functions.html
@@ -5312,6 +5312,12 @@ <h1>Built-in Macro Functions</h1>
 other types of windows if a title is specified as the
 fifth argument.
 <br>
+<a name="Table.showHistogramTable"></a>
+<b>Table.showHistogramTable</b> -
+Equivalent to clicking on "List" in a Histogram
+window.
+Requires 1.54j
+<br>
 
 </blockquote>
 
@@ -5459,7 +5465,7 @@ <h1>Built-in Macro Functions</h1>
 
 <p class=navbar> <a href="#Top">top</a> | <a href="https://imagej.nih.gov/ij/index.html">home</a></p>
 
-<small>Last updated 2024/05/15</small>
+<small>Last updated 2024-06-12</small>
 
 </body>
 </html>
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.54j";
-	public static final String BUILD = "22";
+	public static final String BUILD = ""; //25
 	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/HistogramWindow.java b/ij/gui/HistogramWindow.java
@@ -11,6 +11,7 @@
 import ij.measure.*;
 import ij.plugin.filter.Analyzer;
 import ij.text.TextWindow;
+import ij.plugin.frame.Recorder;
 
 /** This class is an extended ImageWindow that displays histograms. */
 public class HistogramWindow extends ImageWindow implements Measurements, ActionListener, 
@@ -525,11 +526,11 @@ public ResultsTable getResultsTable() {
 		return rt;
 	}
 
-	protected void showList() {
+	public void showList() {
 		ResultsTable rt = getResultsTable();
 		rt.show(getTitle());
 	}
-
+		
 	protected void copyToClipboard() {
 		Clipboard systemClipboard = null;
 		try {systemClipboard = getToolkit().getSystemClipboard();}
@@ -571,9 +572,11 @@ public void actionPerformed(ActionEvent e) {
 			toggleLiveMode();
 		else if (b==rgb)
 			changeChannel();
-		else if (b==list)
+		else if (b==list) {
 			showList();
-		else if (b==copy)
+			if (!Recorder.scriptMode())
+				Recorder.record("Table.showHistogramTable");
+		} else if (b==copy)
 			copyToClipboard();
 		else if (b==log) {
 			logScale = !logScale;
@@ -723,5 +726,5 @@ private void removeListeners() {
 			live.setForeground(Color.black);
 		}
 	}
-
+	
 }
diff --git a/ij/macro/Functions.java b/ij/macro/Functions.java
@@ -7274,11 +7274,28 @@ else if (name.equals("setSelection"))
 			return setSelection();
 		else if (name.equals("setLocAndSize") || name.equals("setLocationAndSize"))
 			return setTableLocAndSize();
+		else if (name.equals("showHistogramTable") || name.equals("list"))
+			return tableList();
 		else
 			interp.error("Unrecognized function name");
 		return null;
 	}
-
+
+	private Variable tableList() {
+		ImagePlus img = WindowManager.getCurrentImage();
+		boolean isHistogram = false;
+		if (img!=null) {
+			ImageWindow win = img.getWindow();
+			if (win!=null && win instanceof HistogramWindow) {
+				((HistogramWindow)win).showList();
+				isHistogram = true;
+			}
+		}
+		if (!isHistogram)
+			interp.error("No histogram window");
+		return null;
+	}
+
 	private Variable setTableLocAndSize() {
 		double x = getFirstArg();
 		double y = getNextArg();

diff --git a/ij/plugin/Benchmark.java b/ij/plugin/Benchmark.java
@@ -13,6 +13,7 @@
 */
 public class Benchmark implements PlugIn {
     private String[] results = {
+        " 6.8|MacBook Pro (M3 Pro, 2023)",
         " 9.5|MacBook Pro (M1 Max, 2021)",
         "10.5|Custom PC (12th Gen Core i9, 2022)",
         "10.9|MacBook Air (M1, 2020, Native)",

diff --git a/release-notes.html b/release-notes.html
@@ -5,19 +5,23 @@
 </head>
 <body>
 
-<li> <u>1.54j22  24 May 2024</u>
+<li> <u>1.54j  12 June 2024</u>
 <ul>
 <li> Thanks to 'ramnoob', added a number of official tags 
 to the DICOM reader.
 <li> Thanks to Abdul Hannan, changed the default extension
 used by the <i>File&gt;Save As&gt;Text Image</i> command from
-“.txt” to “.csv”.
+".txt" to ".csv".
 <li> Thanks to Gabriel Landini, ImageJ adds an "*" next to
 the Mode value in the Histogram window if the histogram is
 multi-modal.
 <li> Thanks to Norbert Vischer, added the
 setOption("MouseWheelStackScrolling",boolean) macro
 function.
+<li> Thanks to Gilles Carpentier, added the
+Table.showHistogramTable macro function, which is
+equivalent to clicking on "List" in a Histogram
+window.
 <li> Thanks to Albert Cardona and Curtis Rueden, added
 public setEqualize() and setSaturated() methods to the
 ContrastEnhancer class.
@@ -27,7 +31,7 @@
 <li> Thanks to Norbert Vischer, fixed bug where empty string
 fields in tables are converted to NaNs after the table is
 saved and reopened.
-<li> Thanks to Stein Rorvik, fixed a bug where the
+<li> Thanks to Stein Rorvik, fixed bug where the
 Table.getColumn() macro function did not work with
 columns containing empty strings.
 <li> Thanks to Norbert Vischer, fixed bug where
@@ -38,8 +42,8 @@
 work as expected.
 <li> Thanks to Norbert Vischer, fixed an Overlay.clear macro
 function bug.
-<Li> Thanks to Alexander Bender, fixed bug with ROI Manager
-ignoring selection when saving.
+<Li> Thanks to Alexander Bender, fixed bug with the ROI Manager
+ignoring selections when saving.
 <li> Thanks to Michael Schmid, fixed 1.53t regression
 where Image&gt;Stacks&gt;Z Project</i> failed when doing
 "Average" projection of 32-bit float stacks