2024.10.28 (1.54m16; Histogram bin width)

ij/IJ.java

@@ -2574,6 +2574,7 @@ public static void protectStatusBar(boolean protect) {
 			statusBarThread = null;
 	}
 
+	/** Returns 'true' if the Recorder is running and ImageJ is not in headless mode. */
 	public static boolean recording() {
 		return (!GraphicsEnvironment.isHeadless()&&Recorder.record);
 	}

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 = "12";
+	public static final String BUILD = "16";
 	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

@@ -381,9 +381,9 @@ public static String getHomeDir() {
 	public static String getImageJDir() {
 		String path = Menus.getImageJPath();
 		if (path==null) {
-			String ijPath = getPluginsDirProperty();
-			//if (ijPath==null)
-			//	ijPath = ImageJDir;
+			String ijPath = ImageJDir;
+			if (ijPath==null)
+				ijPath = getPluginsDirProperty();
 			if (ijPath==null)
 				ijPath = System.getProperty("user.dir");
 			return ijPath + File.separator;
@@ -442,7 +442,7 @@ public static String getPrefsDir() {
 
 	/** Sets the path to the ImageJ directory. */
 	static void setHomeDir(String path) {
-		if (path.endsWith(File.separator))
+		if (path.endsWith(File.separator) || path.endsWith("/"))
 			path = path.substring(0, path.length()-1);
 		ImageJDir = path;
 	}

ij/gui/HistogramPlot.java

@@ -287,9 +287,6 @@ void drawText(ImageProcessor ip, int x, int y, boolean fixedRange) {
 		ip.setAntialiasedText(true);
 		double hmin = cal.getCValue(stats.histMin);
 		double hmax = cal.getCValue(stats.histMax);
-		double range = hmax-hmin;
-		if (fixedRange&&!cal.calibrated()&&hmin==0&&hmax==255)
-			range = 256;
 		ip.drawString(d2s(hmin), x - 4, y);
 		ip.drawString(d2s(hmax), x + HIST_WIDTH - getWidth(hmax, ip) + 10, y);
 		if (rgbMode>=INTENSITY1) {
@@ -307,7 +304,7 @@ void drawText(ImageProcessor ip, int x, int y, boolean fixedRange) {
 			}
 			ip.setJustification(ImageProcessor.LEFT_JUSTIFY);
 		}        
-		double binWidth = range/stats.nBins;
+		double binWidth = (hmax-hmin+1)/stats.nBins;
 		binWidth = Math.abs(binWidth);
 		showBins = binWidth!=1.0 || !fixedRange;
 		col1 = XMARGIN + 5;

ij/gui/HistogramWindow.java

@@ -423,9 +423,6 @@ void drawText(ImageProcessor ip, int x, int y, boolean fixedRange) {
 		ip.setAntialiasedText(true);
 		double hmin = cal.getCValue(stats.histMin);
 		double hmax = cal.getCValue(stats.histMax);
-		double range = hmax-hmin;
-		if (fixedRange&&!cal.calibrated()&&hmin==0&&hmax==255)
-			range = 256;
 		ip.drawString(d2s(hmin), x - 4, y);
 		ip.drawString(d2s(hmax), x + HIST_WIDTH - getWidth(hmax, ip) + 10, y);
 		if (rgbMode>=INTENSITY1) {
@@ -443,7 +440,7 @@ void drawText(ImageProcessor ip, int x, int y, boolean fixedRange) {
 			}
 			ip.setJustification(ImageProcessor.LEFT_JUSTIFY);
 		}        
-		double binWidth = range/stats.nBins;
+		double binWidth = (hmax-hmin+1)/stats.nBins;
 		binWidth = Math.abs(binWidth);
 		showBins = binWidth!=1.0 || !fixedRange;
 		col1 = XMARGIN + 5;

ij/macro/Functions.java

@@ -2304,6 +2304,7 @@ void makeSelection() {
 		} else if (name.equals("drawShapes")) {
 			return drawShapes();
 		} else if (name.equals("drawGrid")) {
+			interp.getParens();
 			plot.drawShapes("redraw_grid", null);
 			return Double.NaN;
 		} else if (name.startsWith("setLineWidth")) {

ij/measure/ResultsTable.java

@@ -382,6 +382,29 @@ public ImageProcessor getTableAsImage() {
 		return fp;
 	}
 
+	/** Creates a ResultsTable from an image or image selection. */
+	public static ResultsTable createTableFromImage(ImagePlus imp) {
+		if (imp==null)
+			return null;
+		Roi roi = imp.getRoi();
+		ImageProcessor ip = imp.getProcessor();
+		if (roi==null || roi.getType()==Roi.RECTANGLE)
+			return createTableFromImage(ip);
+		ResultsTable rt = new ResultsTable();
+		Rectangle r = ip.getRoi();
+		for (int y=r.y; y<r.y+r.height; y++) {
+			rt.incrementCounter();
+			rt.addLabel(" ", "Y"+y);
+			for (int x=r.x; x<r.x+r.width; x++) {
+				if (roi.contains(x,y))
+					rt.addValue("X"+x, ip.getPixelValue(x,y));
+				else
+					rt.addValue("X"+x, Double.NaN);
+			}
+		}
+		return rt;
+	}
+
 	/** Creates a ResultsTable from an image or image selection. */
 	public static ResultsTable createTableFromImage(ImageProcessor ip) {
 		ResultsTable rt = new ResultsTable();

ij/plugin/SimpleCommands.java

@@ -169,10 +169,9 @@ private void removeStackLabels() {
 	}
 
 	private void imageToResults() {
-		ImagePlus imp = IJ.getImage();
-		ImageProcessor ip = imp.getProcessor();
-		ResultsTable rt = ResultsTable.createTableFromImage(ip);
-		rt.show("Results");
+		ResultsTable rt = ResultsTable.createTableFromImage(IJ.getImage());
+		if (rt!=null)
+			rt.show("Results");
 	}
 
 	private void resultsToImage() {

ij/process/ColorStatistics.java

@@ -96,7 +96,7 @@ void getIntStatistics(ImageProcessor ip) {
 			}
 		}
 		min = roiMin; max = roiMax;
-		binSize = (max-min)/nBins;
+		binSize = (max-min+1)/nBins;
 		histMin = min; 
 		histMax = max;
 

ij/process/FloatStatistics.java

@@ -86,7 +86,7 @@ void getStatistics(ImageProcessor ip, double minThreshold, double maxThreshold)
 			if (max>histMax)
 				max = histMax;
 		}
-		binSize = (histMax-histMin)/nBins;
+		binSize = (histMax-histMin+1)/nBins;
 
 		// Generate histogram
 		double scale = nBins/(histMax-histMin);

ij/process/ShortStatistics.java

@@ -91,7 +91,7 @@ void getStatistics(ImageProcessor ip, int[] hist, int min, int max, float[] cTab
 			if (min<histMin) min = (int)histMin;
 			if (max>histMax) max = (int)histMax;
 		}
-		binSize = (histMax-histMin)/nBins;
+		binSize = (histMax-histMin+1)/nBins;
 		double scale = 1.0/binSize;
 		int hMin = (int)histMin;
 		histogram = new int[nBins]; // 256 bin histogram

ij/process/StackStatistics.java

@@ -146,7 +146,7 @@ void doCalculations(ImagePlus imp,  int bins, double histogramMin, double histog
         calculateStdDev(longPixelCount, sum, sum2);
         histMin = cal.getRawValue(histMin); 
         histMax =  cal.getRawValue(histMax);
-        binSize = (histMax-histMin)/nBins;
+        binSize = (histMax-histMin+1)/nBins;
         int bits = imp.getBitDepth();
         if (histMin==0.0 && histMax==256.0 && (bits==8||bits==24))
         	histMax = 255.0;
@@ -297,7 +297,7 @@ void get16BitStatistics(long[] hist, int min, int max) {
 		nBins = 256;
 		histMin = min; 
 		histMax = max;
-		binSize = (histMax-histMin)/nBins;
+		binSize = (histMax-histMin+1)/nBins;
 		double scale = 1.0/binSize;
 		int hMin = (int)histMin;
 		longHistogram = new long[nBins]; // 256 bin histogram

release-notes.html

@@ -6,8 +6,12 @@
 <body>
 
 
-<li> <u>1.54m12  17 October 2024</u>
+<li> <u>1.54m16  28 October 2024</u>
 <ul>
+<li> Thanks to 'Patricia' and Herbie Gluender, the
+<i>Image&gt;Transform&gt;Image to Results</i> command
+now shows NaNs when values are outside non-rectangular
+selections.
 <li> Thanks to Kevin Terretaz, CommandFinder
 (<i>Plugins&gt;Utilities&gt;Find Commands</i>) filtering is more
 precise and flexible. It now splits the input into individual words 
@@ -24,7 +28,12 @@
 to the image width or vertical lines with a length equal to
 the image height.
 <li> Thanks to Peter Dodok, fixed bug with recording in
-Fiji headless mode
+Fiji headless mode.
+<li> Thanks to Jerome Mutterer, fixed bug where the -ijpath
+command line option is not respected when using the
+-batch option.
+<li> Thanks to Guenter Pudmich, fixed bug with the calculation
+of 16 and 32 bit histogram bin widths.
 </ul>
 
 <li> <u>1.54k  15 September 2024</u>