2014.06.26 (1.49c22)

lizhanhui · Jun 26, 2014 · df013c7 · df013c7
1 parent dc92be4
commit df013c7
Show file tree

Hide file tree

Showing 5 changed files with 17 additions and 16 deletions.
diff --git a/ij/ImageJ.java b/ij/ImageJ.java
@@ -77,7 +77,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.49c";
-	public static final String BUILD = "20"; 
+	public static final String BUILD = "22"; 
 	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
@@ -1089,16 +1089,6 @@ public int isHandle(int sx, int sy) {
 		return handle;
 	}
 
-	/** Override Roi.nudge() to support splines. */
-	//public void nudge(int key) {
-	//	super.nudge(key);
-	//	if (xSpline!=null) {
-	//		fitSpline();
-	//		updateFullWindow = true;
-	//		imp.draw();
-	//	}
-	//}
-
 	public ImageProcessor getMask() {
 		if (cachedMask!=null && cachedMask.getPixels()!=null
 		&& cachedMask.getWidth()==width && cachedMask.getHeight()==height)

diff --git a/ij/gui/Roi.java b/ij/gui/Roi.java
@@ -805,6 +805,8 @@ void move(int sx, int sy) {
 
 	/** Nudge ROI one pixel on arrow key press. */
 	public void nudge(int key) {
+		if (WindowManager.getActiveWindow() instanceof ij.plugin.frame.RoiManager)
+			return;
 		switch(key) {
 			case KeyEvent.VK_UP:
 				y--;

diff --git a/ij/plugin/frame/RoiManager.java b/ij/plugin/frame/RoiManager.java
@@ -1987,7 +1987,7 @@ public void select(ImagePlus imp, int index) {
 		if (imp==null)
 			imp = WindowManager.getCurrentImage();
 		if (imp!=null)
-			restore(imp, index, true);	
+			restore(imp, index, true);
 		if (mm) list.setSelectionMode(ListSelectionModel.MULTIPLE_INTERVAL_SELECTION);
 	}
 
@@ -2184,11 +2184,16 @@ public void valueChanged(ListSelectionEvent e) {
 			return;
 		}
 		int[] selected = list.getSelectedIndices();
-		if (selected.length==0)
+		if (selected.length==0) {
+			imageID = 0;
 			return;
+		}
 		if (WindowManager.getCurrentImage()!=null) {
-			if (selected.length==1)
-				restore(getImage(), selected[0], true);
+			if (selected.length==1) {
+				ImagePlus imp = getImage();
+				restore(imp, selected[0], true);
+				imageID = imp!=null?imp.getID():0;
+			}
 			if (record()) {
 				String arg = Arrays.toString(selected);
 				if (!arg.startsWith("[") || !arg.endsWith("]"))
@@ -2217,6 +2222,8 @@ public void windowActivated(WindowEvent e) {
     		if (imageID!=0 && imp.getID()!=imageID) {
     			showAll(SHOW_NONE);
 				showAllCheckbox.setState(false);
+				select(-1);
+				imageID = 0;
     		}
     	}
 	}

diff --git a/release-notes.html b/release-notes.html
@@ -5,7 +5,7 @@
 </head>
 <body>
 
-<li> <u>1.49c 23 June 2014</u>
+<li> <u>1.49c 26 June 2014</u>
 <ul>
 <li> Selections added to an overlay by the <i>Measure</i> command are
 removed when the correspionding rows in the Results table are cleared.
@@ -48,6 +48,8 @@
 macro function to not work in headless mode.
 <li> Thanks to Tara Ficken and Simon Runde, fixed bugs that 
 sometimes caused ImageJ to incorrectly import TIFF stacks.
+<li> Thanks to Philippe Carl, fixed ROI Manager bugs that caused it to unexpectedly move
+selections when using the arrow keys and to not deselect when switching between image.
 <li> Thanks to Tiago Ferreira, fixed a v1.48m regression that sometimes caused the "List..." 
 button in plot windows to display an empty table.
 <li> Thanks to Gabriel Landini, fixed a v1.49 regression that caused cached versions