Merge branch 'master' of https://github.com/ijpb/MorphoLibJ

ijpb · Feb 14, 2019 · 820628a · 820628a
2 parents 2f9d523 + 15f2b28
commit 820628a
Show file tree

Hide file tree

Showing 4 changed files with 46 additions and 6 deletions.
diff --git a/doc/MorphoLibJ-manual/MorphoLibJ-manual.lyx b/doc/MorphoLibJ-manual/MorphoLibJ-manual.lyx
@@ -9912,7 +9912,7 @@ $r$
 
 \begin_inset Formula 
 \[
-UO_{r}=2\frac{|S_{r}\cap T_{r}|}{|S_{r}\cup T_{r}|}
+UO_{r}=\frac{|S_{r}\cap T_{r}|}{|S_{r}\cup T_{r}|}
 \]
 
 \end_inset
@@ -9928,7 +9928,7 @@ Jaccard Index or Union Overlap for all regions:
 
 \begin_inset Formula 
 \[
-UO=2\frac{\sum_{r}|S_{r}\cap T_{r}|}{\sum_{r}|S_{r}\cup T_{r}|}
+UO=\frac{\sum_{r}|S_{r}\cap T_{r}|}{\sum_{r}|S_{r}\cup T_{r}|}
 \]
 
 \end_inset

diff --git a/src/main/java/inra/ijpb/plugins/InteractiveMarkerControlledWatershed.java b/src/main/java/inra/ijpb/plugins/InteractiveMarkerControlledWatershed.java
@@ -348,7 +348,20 @@ else if( e.getSource()  == shuffleColorsButton )
 			    	break;
 			    }
 			}
-
+			// Zoom out if canvas is too large
+			while( ( ic.getWidth() > 0.75 * screenWidth ||
+					ic.getHeight() > 0.75 * screenHeight ) &&
+					ic.getMagnification() > 1/72.0 )
+			{
+				final int canvasWidth = ic.getWidth();
+				ic.zoomOut( 0, 0 );
+				// check if canvas size changed (otherwise stop zooming)
+				if( canvasWidth == ic.getWidth() )
+				{
+					ic.zoomIn(0, 0);
+					break;
+				}
+			}
 			setTitle( "Interactive Marker-controlled Watershed" );
 
 			// select point tool for manual label merging

diff --git a/src/main/java/inra/ijpb/plugins/LabelEdition.java b/src/main/java/inra/ijpb/plugins/LabelEdition.java
@@ -228,7 +228,20 @@ public CustomWindow( ImagePlus imp )
 					break;
 				}
 		    }
-
+			// Zoom out if canvas is too large
+			while( ( ic.getWidth() > 0.75 * screenWidth ||
+					ic.getHeight() > 0.75 * screenHeight ) &&
+					ic.getMagnification() > 1/72.0 )
+			{
+				final int canvasWidth = ic.getWidth();
+				ic.zoomOut( 0, 0 );
+				// check if canvas size changed (otherwise stop zooming)
+				if( canvasWidth == ic.getWidth() )
+				{
+					ic.zoomIn(0, 0);
+					break;
+				}
+			}
 			setTitle( "Label Edition" );
 
 			mergeButton = new JButton( "Merge" );

diff --git a/src/main/java/inra/ijpb/plugins/MorphologicalSegmentation.java b/src/main/java/inra/ijpb/plugins/MorphologicalSegmentation.java
@@ -460,8 +460,8 @@ else if( e.getSource()  == shuffleColorsButton )
 			double screenHeight = screenSize.getHeight();
 
 			// Zoom in if image is too small
-			while( 	ic.getWidth() < screenWidth/2 &&
-				ic.getHeight() < screenHeight/2 &&
+			while( ( ic.getWidth() < screenWidth/2 ||
+				ic.getHeight() < screenHeight/2 ) &&
 				ic.getMagnification() < 32.0 )			
 			    {
     				final int canvasWidth = ic.getWidth();
@@ -473,6 +473,20 @@ else if( e.getSource()  == shuffleColorsButton )
     					break;
     				}
 			    }
+			// Zoom out if canvas is too large
+			while( ( ic.getWidth() > 0.75 * screenWidth ||
+				ic.getHeight() > 0.75 * screenHeight ) &&
+				ic.getMagnification() > 1/72.0 )
+				{
+	    			final int canvasWidth = ic.getWidth();
+	    			ic.zoomOut( 0, 0 );
+	    			// check if canvas size changed (otherwise stop zooming)
+	    			if( canvasWidth == ic.getWidth() )
+	    			{
+	    				ic.zoomIn(0, 0);
+	    				break;
+	    			}
+				}
 
 			setTitle( "Morphological Segmentation" );