Rename class DetectOverlappingSpots -> CreateConflictTagSet

mastodon-sc · Jun 25, 2024 · ac1c312 · ac1c312
1 parent c7b042e
commit ac1c312
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 19 deletions.
diff --git a/src/main/java/org/mastodon/mamut/tomancak/TomancakPlugins.java b/src/main/java/org/mastodon/mamut/tomancak/TomancakPlugins.java
@@ -60,7 +60,7 @@
 import org.mastodon.mamut.tomancak.merging.MergeDatasets;
 import org.mastodon.mamut.tomancak.merging.MergingDialog;
 import org.mastodon.mamut.tomancak.resolve.AverageSpots;
-import org.mastodon.mamut.tomancak.resolve.DetectOverlappingSpotsView;
+import org.mastodon.mamut.tomancak.resolve.CreateConflictTagSetCommand;
 import org.mastodon.mamut.tomancak.resolve.LocateTagsFrame;
 import org.mastodon.mamut.tomancak.sort_tree.FlipDescendants;
 import org.mastodon.mamut.tomancak.sort_tree.SortTree;
@@ -512,7 +512,7 @@ private void mirrorSpots()
 
 	private void createConflictTagSet()
 	{
-		DetectOverlappingSpotsView.run( pluginAppModel );
+		CreateConflictTagSetCommand.run( pluginAppModel );
 	}
 
 	private void combineSelectedSpots()

diff --git a/...ancak/resolve/DetectOverlappingSpots.java → ...omancak/resolve/CreateConflictTagSet.java b/...ancak/resolve/DetectOverlappingSpots.java → ...omancak/resolve/CreateConflictTagSet.java
@@ -33,7 +33,7 @@
 import gnu.trove.set.TIntSet;
 import gnu.trove.set.hash.TIntHashSet;
 
-public class DetectOverlappingSpots
+public class CreateConflictTagSet
 {
 	public static void run( final Model model, final String tagSetName, final double threshold )
 	{

diff --git a/...k/resolve/DetectOverlappingSpotsView.java → .../resolve/CreateConflictTagSetCommand.java b/...k/resolve/DetectOverlappingSpotsView.java → .../resolve/CreateConflictTagSetCommand.java
@@ -8,7 +8,7 @@
 import org.scijava.plugin.Plugin;
 
 @Plugin( type = Command.class, name = "Create Conflict Tag Set" )
-public class DetectOverlappingSpotsView extends DefaultCancelable implements Command
+public class CreateConflictTagSetCommand extends DefaultCancelable implements Command
 {
 	/**
 	 * Only spheres that strongly overlap are considered to be in conflict.
@@ -42,15 +42,15 @@ public class DetectOverlappingSpotsView extends DefaultCancelable implements Com
 	public static void run( final ProjectModel projectModel )
 	{
 		final CommandService cmd = projectModel.getContext().service( CommandService.class );
-		cmd.run( DetectOverlappingSpotsView.class, true, "projectModel", projectModel );
+		cmd.run( CreateConflictTagSetCommand.class, true, "projectModel", projectModel );
 	}
 
 	@Override
 	public void run()
 	{
 		final double threshold = getThreshold();
 		final String tagSetName = String.format( "Conflicting Spots (threshold=%1.2f)", threshold );
-		DetectOverlappingSpots.run( projectModel.getModel(), tagSetName, threshold );
+		CreateConflictTagSet.run( projectModel.getModel(), tagSetName, threshold );
 	}
 
 	private double getThreshold()

diff --git a/...k/resolve/DetectOverlappingSpotsTest.java → ...cak/resolve/CreateConflictTagSetTest.java b/...k/resolve/DetectOverlappingSpotsTest.java → ...cak/resolve/CreateConflictTagSetTest.java
@@ -8,7 +8,7 @@
 import org.mastodon.mamut.model.Spot;
 import org.mastodon.util.TagHelper;
 
-public class DetectOverlappingSpotsTest
+public class CreateConflictTagSetTest
 {
 	@Test
 	public void test()
@@ -17,7 +17,7 @@ public void test()
 		addShortTack( model, 1, 2, 3, 1.1, 2.1, 3.1 );
 		addShortTack( model, 5, 3, 4, 5.1, 3.1, 4.1 );
 		addShortTack( model, 5, 3.2, 4, 5.1, 3.2, 4.1 );
-		DetectOverlappingSpots.run( model, "Conflicting Spots", 0.4 );
+		CreateConflictTagSet.run( model, "Conflicting Spots", 0.4 );
 		assertEquals( 2, new TagHelper( model, "Conflicting Spots", "Conflict 0 (a)" ).getTaggedSpots().size() );
 		assertEquals( 2, new TagHelper( model, "Conflicting Spots", "Conflict 0 (b)" ).getTaggedSpots().size() );
 	}
@@ -33,16 +33,16 @@ private void addShortTack( final Model model, final double x1, final double y1,
 	@Test
 	public void testGetLetters()
 	{
-		assertEquals( "a", DetectOverlappingSpots.getLetters( 0 ) );
-		assertEquals( "b", DetectOverlappingSpots.getLetters( 1 ) );
-		assertEquals( "z", DetectOverlappingSpots.getLetters( 25 ) );
-		assertEquals( "aa", DetectOverlappingSpots.getLetters( 26 ) );
-		assertEquals( "az", DetectOverlappingSpots.getLetters( 51 ) );
-		assertEquals( "ba", DetectOverlappingSpots.getLetters( 52 ) );
-		assertEquals( "bz", DetectOverlappingSpots.getLetters( 77 ) );
-		assertEquals( "ca", DetectOverlappingSpots.getLetters( 78 ) );
-		assertEquals( "zz", DetectOverlappingSpots.getLetters( 701 ) );
-		assertEquals( "aaa", DetectOverlappingSpots.getLetters( 702 ) );
-		assertEquals( "aaz", DetectOverlappingSpots.getLetters( 727 ) );
+		assertEquals( "a", CreateConflictTagSet.getLetters( 0 ) );
+		assertEquals( "b", CreateConflictTagSet.getLetters( 1 ) );
+		assertEquals( "z", CreateConflictTagSet.getLetters( 25 ) );
+		assertEquals( "aa", CreateConflictTagSet.getLetters( 26 ) );
+		assertEquals( "az", CreateConflictTagSet.getLetters( 51 ) );
+		assertEquals( "ba", CreateConflictTagSet.getLetters( 52 ) );
+		assertEquals( "bz", CreateConflictTagSet.getLetters( 77 ) );
+		assertEquals( "ca", CreateConflictTagSet.getLetters( 78 ) );
+		assertEquals( "zz", CreateConflictTagSet.getLetters( 701 ) );
+		assertEquals( "aaa", CreateConflictTagSet.getLetters( 702 ) );
+		assertEquals( "aaz", CreateConflictTagSet.getLetters( 727 ) );
 	}
 }