2020.08.31 (1.53e10; Copy to System)

Author: rasband

ij/ImageJ.java

@@ -71,14 +71,14 @@ Runs a macro or script (JavaScript, BeanShell or Python) in
   -debug
      Runs ImageJ in debug mode
 </pre>
-@author Wayne Rasband ([email protected])
+@author Wayne Rasband ([email protected])
 */
 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.53e";
-	public static final String BUILD = "8";
+	public static final String BUILD = "10";
 	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/ImagePlus.java

@@ -2726,6 +2726,12 @@ private String getValueAsString(int x, int y) {
 		}
     }
 
+	/** Copies the contents of the current selection to the internal
+		clipboard and then clears the selection. */
+	public void cut() {
+		copy(true);
+	}
+
 	/** Copies the contents of the current selection, or the entire
 		image if there is no selection, to the internal clipboard. */
 	public void copy() {
@@ -2774,8 +2780,7 @@ public void copy(boolean cut) {
 		}
     }
 
-
-	 /** Inserts the contents of the internal clipboard into the active image. If there
+	 /** Inserts the contents of the internal clipboard into this image. If there
 	 is a selection the same size as the image on the clipboard, the image is inserted
 	 into that selection, otherwise the selection is inserted into the center of the image.*/
 	 public void paste() {
@@ -2843,6 +2848,12 @@ public static void resetClipboard() {
 		clipboard = null;
 	}
 
+	/** Copies the contents of the current selection, or the entire
+		image if there is no selection, to the system clipboard. */
+	public void copyToSystem() {
+		Clipboard.copyToSystem(this);
+	}
+
 	protected void notifyListeners(final int id) {
 	    final ImagePlus imp = this;
 		EventQueue.invokeLater(new Runnable() {

ij/macro/MacroRunner.java

@@ -37,7 +37,7 @@ public MacroRunner(String macro, Editor editor) {
 		thread.start();
 	}
 
-	/** Interprets macro source in a separate thread using a string argument. */
+	/** Interprets macro source in a separate thread, passing a string argument. */
 	public MacroRunner(String macro, String argument) {
 		this.macro = macro;
 		this.argument = argument;

ij/plugin/Clipboard.java

@@ -8,12 +8,14 @@
 import ij.process.*;
 import ij.gui.*;
 import ij.plugin.frame.Editor;
+import ij.plugin.frame.Recorder;
 import ij.text.TextWindow;
 import ij.util.Tools;
 
 /**	Copies/pastes images to/from the system clipboard. */
 public class Clipboard implements PlugIn, Transferable {
 	static java.awt.datatransfer.Clipboard clipboard;
+	private ImagePlus gImp;
 
 	public void run(String arg) {
 		if (IJ.altKeyDown()) {
@@ -36,6 +38,16 @@ else if (arg.equals("show"))
 			showInternalClipboard();
 	}
 
+	/** Copies the contents of the specified image, or selection, to the system clicpboard. */
+	public static void copyToSystem(ImagePlus imp) {
+		Clipboard cplugin = new Clipboard();
+		cplugin.gImp = imp;
+		cplugin.setup();
+		try {
+			cplugin.clipboard.setContents(cplugin, null);
+		} catch (Throwable t) {}
+	}
+	
 	void copy(boolean cut) {
 		ImagePlus imp = WindowManager.getCurrentImage();
 		if (imp!=null) {
@@ -44,6 +56,12 @@ void copy(boolean cut) {
 	 			imp.changes = true;
 	 	} else
 	 		IJ.noImage();
+	 	if (Recorder.scriptMode()) {
+	 		if (cut)
+				Recorder.recordCall("imp.cut();");
+			else
+				Recorder.recordCall("imp.copy();");
+	 	}
 	}
 
 	private ImagePlus flatten(ImagePlus imp) {
@@ -67,9 +85,11 @@ void paste() {
 			showSystemClipboard();
 		else {
 			ImagePlus imp = WindowManager.getCurrentImage();
-			if (imp!=null)
+			if (imp!=null) {
 				imp.paste();
-			else
+				if (Recorder.scriptMode())
+					Recorder.recordCall("imp.paste();");
+			} else
 				showInternalClipboard	();
 		}
 	}
@@ -80,10 +100,13 @@ void setup() {
 	}
 
 	void copyToSystem() {
+		this.gImp = WindowManager.getCurrentImage();
 		setup();
 		try {
 			clipboard.setContents(this, null);
 		} catch (Throwable t) {}
+	 	if (Recorder.scriptMode())
+			Recorder.recordCall("imp.copyToSystem();");
 	}
 
 	void showSystemClipboard() {
@@ -134,7 +157,7 @@ public boolean isDataFlavorSupported(DataFlavor flavor) {
 	public Object getTransferData(DataFlavor flavor) throws UnsupportedFlavorException {
 		if (!isDataFlavorSupported(flavor))
 			throw new UnsupportedFlavorException(flavor);
-		ImagePlus imp = WindowManager.getCurrentImage();
+		ImagePlus imp = gImp!=null?gImp:WindowManager.getCurrentImage();
 		if (imp==null)
 			return null;
 		Roi roi = imp.getRoi();

module-info.java

@@ -1,18 +1,18 @@
 module ij {
-   requires java.desktop;
+	requires java.desktop;
 	requires java.rmi;
-   requires java.compiler;
-   requires java.scripting;
-   exports ij;
-   exports ij.gui;
-   exports ij.io;
-   exports ij.macro;
-   exports ij.measure;
-   exports ij.plugin;
-   exports ij.plugin.filter;
-   exports ij.plugin.frame;
-   exports ij.plugin.tool;
-   exports ij.process;
-   exports ij.text;
-   exports ij.util;
+	requires java.compiler;
+	requires java.scripting;
+	exports ij;
+	exports ij.gui;
+	exports ij.io;
+	exports ij.macro;
+	exports ij.measure;
+	exports ij.plugin;
+	exports ij.plugin.filter;
+	exports ij.plugin.frame;
+	exports ij.plugin.tool;
+	exports ij.process;
+	exports ij.text;
+	exports ij.util;
 }

release-notes.html

@@ -5,7 +5,7 @@
 </head>
 <body>x
 
-<li> <u>1.53e8  30 August 2020</u>
+<li> <u>1.53e10  31 August 2020</u>
 <ul>
 <li> The "Black background" option is set 'true' on startup and
 is not saved in the preferences file. Add
@@ -19,13 +19,17 @@
 function, which returns the number of selected ROIs in the
 ROI Manager
 (<a href="http://wsr.imagej.net/macros/SetGroupDemo.txt">example</a>).
+<li>Thanks to Fred Damen, added the ImagePlus.copyToSystem() method.
 <li> Thanks to Philippe Carl, fixed a bug that allowed multiple copies
 of the Color Picker to be opened.
 <li> Thanks to 'Ben', fixed a bug that caused the Table.get()
 macro function to return strings instead of numbers.
+<li>Thanks to Fred Damen and Michael chmid, fixed a bug
+that caused the run("Copy to System") macro function to
+sometimes copy the wrong image to the system clipboard.
 <li> Thanks to Martin Hohne, fixed a 1.53c regression that caused
 the Counter popup menu in the Point Tool options Dialog
-to not work as expected .after switching to a different image.
+to not work as expected after switching to a different image.
 </ul>
 
 <li> <u>1.53d  20 August 2020</u>