fix new roi count autotrace macro mode

Author: ekatrukha

src/main/java/bigtrace/math/FullAutoTrace.java

@@ -65,7 +65,6 @@ protected Void doInBackground() throws Exception
 		runFullAutoTrace();
 		return null;
 	}
-
 
 	public void runFullAutoTrace()
 	{
@@ -81,6 +80,7 @@ public void runFullAutoTrace()
 		oneClickTrace.init();
 
 		setProgress(0);
+		int nCurrRoiN = nCount;
 		for(int nTP = nFirstTP; nTP <= nLastTP; nTP++)
 		{
 
@@ -115,23 +115,25 @@ public void runFullAutoTrace()
 					if(!oneClickTrace.bStartLocationOccupied)
 					{
 						mask.markROI( bt.roiManager.getActiveRoi() );
+						nCount++;
 					}
 					if( bt.roiManager.getActiveRoi() instanceof LineTrace3D )
 					{
 						final LineTrace3D newtrace = (LineTrace3D)bt.roiManager.getActiveRoi();
 						if(newtrace.getNumberOfPointsInJointSegment() < nAutoMinPointsCurve)
 						{
 							bt.roiManager.deleteActiveROI();
+							nCount--;
 						}
-						else
+					}
+					if( bt.btMacro.bMacroMode )
+					{
+						if(nCurrRoiN != nCount)
 						{
-							nCount++;
-							if( bt.btMacro.bMacroMode )
+							nCurrRoiN = nCount;						
+							if(nCount % 20 == 0)
 							{
-								if(nCount % 20 == 0)
-								{
-									IJ.log( "Auto trace progress: found " +Integer.toString( nCount ) + " ROIs, current start intensity is " +Double.toString( newMax.getA() )+".");									
-								}
+								IJ.log( "Auto trace progress: found " +Integer.toString( nCount ) + " ROIs, current start intensity is " +Double.toString( newMax.getA() )+".");									
 							}
 						}
 					}
@@ -185,7 +187,7 @@ public void done()
 
     public void wrapUp()
     {
-    	TaskBT.runOnEDTAndWait( () ->
+    	TaskBT.runOnEDT( () ->
     	{
     		if(butAuto != null && tabIconRestore != null)
     		{