Avoid possible bugs when zooming in small images.

ijpb · Aug 15, 2017 · 00dca65 · 00dca65
1 parent f5fd9c9
commit 00dca65
Show file tree

Hide file tree

Showing 3 changed files with 30 additions and 6 deletions.
diff --git a/src/main/java/inra/ijpb/plugins/InteractiveMarkerControlledWatershed.java b/src/main/java/inra/ijpb/plugins/InteractiveMarkerControlledWatershed.java
@@ -48,10 +48,12 @@
 import inra.ijpb.watershed.Watershed;
 
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.Panel;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.AdjustmentEvent;
@@ -328,9 +330,15 @@ else if( e.getSource()  == shuffleColorsButton )
 
 			final ImageCanvas canvas = (ImageCanvas) getCanvas();
 
+			Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+			double screenWidth = screenSize.getWidth();
+			double screenHeight = screenSize.getHeight();
+
 			// Zoom in if image is too small
-			while(ic.getWidth() < 512 && ic.getHeight() < 512)
-				IJ.run( imp, "In","" );
+			while( 	ic.getWidth() < screenWidth/2 &&
+				ic.getHeight() < screenHeight/2 &&
+				ic.getMagnification() < 32.0 )			
+			    IJ.run( imp, "In","" );
 
 			setTitle( "Interactive Marker-controlled Watershed" );
 

diff --git a/src/main/java/inra/ijpb/plugins/LabelEdition.java b/src/main/java/inra/ijpb/plugins/LabelEdition.java
@@ -21,10 +21,12 @@
  */
 package inra.ijpb.plugins;
 
+import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.Insets;
 import java.awt.Panel;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.WindowEvent;
@@ -203,9 +205,15 @@ public CustomWindow( ImagePlus imp )
 
 			final ImageCanvas canvas = (ImageCanvas) getCanvas();
 
+			Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+			double screenWidth = screenSize.getWidth();
+			double screenHeight = screenSize.getHeight();
+
 			// Zoom in if image is too small
-			while( ic.getWidth() < 512 && ic.getHeight() < 512 )
-				IJ.run( imp, "In","" );
+			while( 	ic.getWidth() < screenWidth/2 &&
+				ic.getHeight() < screenHeight/2 &&
+				ic.getMagnification() < 32.0 )			
+			    IJ.run( imp, "In","" );
 
 			setTitle( "Label Edition" );
 

diff --git a/src/main/java/inra/ijpb/plugins/MorphologicalSegmentation.java b/src/main/java/inra/ijpb/plugins/MorphologicalSegmentation.java
@@ -49,11 +49,13 @@
 import inra.ijpb.watershed.Watershed;
 
 import java.awt.Color;
+import java.awt.Dimension;
 import java.awt.GridBagConstraints;
 import java.awt.GridBagLayout;
 import java.awt.GridLayout;
 import java.awt.Insets;
 import java.awt.Panel;
+import java.awt.Toolkit;
 import java.awt.event.ActionEvent;
 import java.awt.event.ActionListener;
 import java.awt.event.AdjustmentEvent;
@@ -443,9 +445,15 @@ else if( e.getSource()  == shuffleColorsButton )
 
 			final ImageCanvas canvas = (ImageCanvas) getCanvas();
 
+			Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();
+			double screenWidth = screenSize.getWidth();
+			double screenHeight = screenSize.getHeight();
+
 			// Zoom in if image is too small
-			while(ic.getWidth() < 512 && ic.getHeight() < 512)
-				IJ.run( imp, "In","" );
+			while( 	ic.getWidth() < screenWidth/2 &&
+				ic.getHeight() < screenHeight/2 &&
+				ic.getMagnification() < 32.0 )			
+			    IJ.run( imp, "In","" );
 
 			setTitle( "Morphological Segmentation" );