tracks group name generation changed

ekatrukha · Jun 28, 2024 · 6589587 · 6589587
1 parent 31c6e4d
commit 6589587
Show file tree

Hide file tree

Showing 2 changed files with 31 additions and 6 deletions.
diff --git a/src/main/java/bigtrace/BigTraceData.java b/src/main/java/bigtrace/BigTraceData.java
@@ -264,11 +264,6 @@ public class BigTraceData < T extends RealType< T > & NativeType< T > > {
 	/** value of the intensity threshold to stop One click tracing **/
 	public double dOCIntensityThreshold;	
 
-	////////////////////////// TRACKING
-
-	/** for now, generate a number of the track **/
-
-	public static AtomicInteger nTrackN = new AtomicInteger(1);
 
 	///////////////// DEFAULT SETTINGS FOR UNDEFINED GROUP
 

diff --git a/src/main/java/bigtrace/tracks/CurveTracker.java b/src/main/java/bigtrace/tracks/CurveTracker.java
@@ -93,7 +93,7 @@ protected Void doInBackground() throws Exception
 		setProgress(0);	
 
 		//make a New Group
-		newGroupTrack = new Roi3DGroup( currentRoi, String.format("%03d", BigTraceData.nTrackN.getAndIncrement())); 
+		newGroupTrack = new Roi3DGroup( currentRoi, getNewGroupNameInteger()); 
 
 		bt.roiManager.addGroup( newGroupTrack );		
 		bt.roiManager.applyGroupToROI( currentRoi, newGroupTrack  );
@@ -255,5 +255,35 @@ public void done()
     	// bvv_trace = BvvFunctions.show(btdata.trace_weights, "weights", Bvv.options().addTo(bvv_main));
 
     }
+
+    String getNewGroupNameInteger()
+    {
+
+    	int nCand = 1;
+    	boolean bFoundGood = false;
+    	boolean bExistsAlready;
+    	String sCandName = String.format("%03d", nCand);
+    	while (!bFoundGood)
+    	{
+    		bExistsAlready = false;
+    		for (int i=0;i<bt.roiManager.groups.size() && !bExistsAlready;i++)
+    		{
+    			if(sCandName.equals( bt.roiManager.groups.get( i ).getName() ))
+    			{
+    				bExistsAlready = true;
+    			}
+    		}
+    		if(bExistsAlready)
+    		{
+    			nCand++;
+    			sCandName = String.format("%03d", nCand);
+    		}
+    		else
+    		{
+    			return sCandName;
+    		}
+    	}
+    	return "Error";
+    }
 
 }