v.0.5.5

UU-cellbiology · Mar 10, 2021 · 6ab9b17 · 6ab9b17
1 parent 711aebb
commit 6ab9b17
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 30 deletions.
diff --git a/pom.xml b/pom.xml
@@ -14,7 +14,7 @@
 
     <groupId>sc.fiji</groupId>
     <artifactId>ComDet_</artifactId>
-    <version>0.5.4</version>
+    <version>0.5.5</version>
 
     <name>ComDet</name>
     <description>ComDet Plugin for ImageJ</description>

diff --git a/src/main/java/fiji/plugin/ComDet/Detect_Particles.java b/src/main/java/fiji/plugin/ComDet/Detect_Particles.java
@@ -869,7 +869,18 @@ void showTable()
 	/** show Summary and Results tables in case there are no particles **/
 	void showTableNoParticles()
 	{
-		SummaryRT = new ResultsTable();
+
+
+		if(WindowManager.getWindow("Summary")==null || cddlg.nSummaryOptions==0)
+			{SummaryRT = new ResultsTable();}
+		else
+		{
+			//xTemp=Analyzer.getResultsTable();
+			//IJ.renameResults("Temp");
+			IJ.renameResults("Summary", "Results");
+			SummaryRT = Analyzer.getResultsTable();
+			//bSwitch = true;
+		}
 
     	for(int i = 1;i<=imageinfo[3]; i++)//slice
     	{
@@ -886,30 +897,12 @@ void showTableNoParticles()
         	}
     	}
 
-		/*cd.ptable_lock.lock();
-		cd.ptable.incrementCounter();									
-		cd.ptable.addValue("Abs_frame", Float.NaN);
-		cd.ptable.addValue("X_(px)",Float.NaN);	
-		cd.ptable.addValue("Y_(px)",Float.NaN);
-		//ptable.addValue("Frame_Number", nFrame+1);
-		cd.ptable.addValue("Channel", Float.NaN);
-		cd.ptable.addValue("Slice", Float.NaN);
-		cd.ptable.addValue("Frame", Float.NaN);
-		cd.ptable.addValue("xMin", Float.NaN);
-		cd.ptable.addValue("yMin", Float.NaN);
-		cd.ptable.addValue("xMax", Float.NaN);
-		cd.ptable.addValue("yMax", Float.NaN);
-		cd.ptable.addValue("NArea", Float.NaN);
-		cd.ptable.addValue("IntegratedInt", Float.NaN);
 
-		cd.ptable_lock.unlock();
-*/
-        //Show Results table with coordinates
+       		SummaryRT.show("Results");
+        	IJ.renameResults("Summary");
+
+        	cd.ptable.show("Results");
 
-		cd.ptable.show("Results");
-
-    	SummaryRT.show("Summary");
-
 	}
 
 

diff --git a/src/main/resources/plugins.config b/src/main/resources/plugins.config
@@ -1,2 +1,2 @@
-Plugins>ComDet v.0.5.4, "Detect Particles", fiji.plugin.ComDet.Detect_Particles
-Plugins>ComDet v.0.5.4, "Sort Results Table", fiji.plugin.ComDet.Sort_Results_CD
+Plugins>ComDet v.0.5.5, "Detect Particles", fiji.plugin.ComDet.Detect_Particles
+Plugins>ComDet v.0.5.5, "Sort Results Table", fiji.plugin.ComDet.Sort_Results_CD
diff --git a/target/ComDet_-0.5.4-sources.jar → target/ComDet_-0.5.5-sources.jar b/target/ComDet_-0.5.4-sources.jar → target/ComDet_-0.5.5-sources.jar
diff --git a/target/ComDet_-0.5.4.jar → target/ComDet_-0.5.5.jar b/target/ComDet_-0.5.4.jar → target/ComDet_-0.5.5.jar
diff --git a/target/classes/fiji/plugin/ComDet/CDDialog.class b/target/classes/fiji/plugin/ComDet/CDDialog.class
diff --git a/target/classes/fiji/plugin/ComDet/CDProgressCount.class b/target/classes/fiji/plugin/ComDet/CDProgressCount.class
diff --git a/target/classes/fiji/plugin/ComDet/CDThread.class b/target/classes/fiji/plugin/ComDet/CDThread.class
diff --git a/target/classes/fiji/plugin/ComDet/ComDetConstants.class b/target/classes/fiji/plugin/ComDet/ComDetConstants.class
diff --git a/target/classes/fiji/plugin/ComDet/Detect_Particles.class b/target/classes/fiji/plugin/ComDet/Detect_Particles.class
diff --git a/target/classes/plugins.config b/target/classes/plugins.config
@@ -1,2 +1,2 @@
-Plugins>ComDet v.0.5.4, "Detect Particles", fiji.plugin.ComDet.Detect_Particles
-Plugins>ComDet v.0.5.4, "Sort Results Table", fiji.plugin.ComDet.Sort_Results_CD
+Plugins>ComDet v.0.5.5, "Detect Particles", fiji.plugin.ComDet.Detect_Particles
+Plugins>ComDet v.0.5.5, "Sort Results Table", fiji.plugin.ComDet.Sort_Results_CD
diff --git a/target/maven-archiver/pom.properties b/target/maven-archiver/pom.properties
@@ -1,5 +1,5 @@
 #Generated by Apache Maven
-#Mon Jan 18 17:12:27 CET 2021
-version=0.5.4
+#Wed Mar 10 14:48:36 CET 2021
+version=0.5.5
 groupId=sc.fiji
 artifactId=ComDet_