Add contributor, fix small bug

stardist · Apr 7, 2020 · 909f60d · 909f60d
1 parent 8e249e5
commit 909f60d
Show file tree

Hide file tree

Showing 2 changed files with 11 additions and 1 deletion.
diff --git a/pom.xml b/pom.xml
@@ -79,6 +79,11 @@
 			<url>https://github.com/romainGuiet</url>
 			<roles><role>developer</role></roles>
 		</contributor>
+		<contributor>
+			<name>Robert Haase</name>
+			<url>https://github.com/haesleinhuepf</url>
+			<roles><role>developer</role></roles>
+		</contributor>
 	</contributors>
 
 	<mailingLists>
@@ -144,6 +149,7 @@
 			<artifactId>csbdeep</artifactId>
 			<version>0.3.5-SNAPSHOT</version>
 		</dependency>
+		<!-- Utils -->
 		<dependency>
 			<groupId>com.google.code.gson</groupId>
 			<artifactId>gson</artifactId>

diff --git a/src/main/java/de/csbdresden/stardist/StarDist2D.java b/src/main/java/de/csbdresden/stardist/StarDist2D.java
@@ -367,6 +367,9 @@ private boolean checkInputs() {
         if (!( modelChoice.equals(Opt.MODEL_FILE) || modelChoice.equals(Opt.MODEL_URL) || MODELS.containsKey(modelChoice) ))
             return showError(String.format("Unsupported Model \"%s\".", modelChoice));
 
+        if (!(roiPosition.equals(Opt.ROI_POSITION_AUTO) || roiPosition.equals(Opt.ROI_POSITION_STACK) || roiPosition.equals(Opt.ROI_POSITION_HYPERSTACK)))
+            return showError(String.format("%s must be one of {\"%s\", \"%s\", \"%s\"}.", Opt.ROI_POSITION, Opt.ROI_POSITION_AUTO, Opt.ROI_POSITION_STACK, Opt.ROI_POSITION_HYPERSTACK));        
+
         return true;
     }
 
@@ -385,8 +388,9 @@ public static void main(final String... args) throws Exception {
         final ImageJ ij = new ImageJ();
         ij.launch(args);
 
-//        Dataset input = ij.scifio().datasetIO().open(StarDist2D.class.getClassLoader().getResource("yeast_timelapse.tif").getFile());
         Dataset input = ij.scifio().datasetIO().open(StarDist2D.class.getClassLoader().getResource("yeast_crop.tif").getFile());
+//        Dataset input = ij.scifio().datasetIO().open(StarDist2D.class.getClassLoader().getResource("yeast_timelapse.tif").getFile());
+//        Dataset input = ij.scifio().datasetIO().open(StarDist2D.class.getClassLoader().getResource("patho_hyperstack.tif").getFile());
         ij.ui().show(input);
 
 //        Recorder recorder = new Recorder();