adapt until Fiji moves to the next scijava

segment-anything-models-java · Dec 4, 2024 · f3b5ceb · f3b5ceb
1 parent b305e21
commit f3b5ceb
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 2 deletions.
diff --git a/src/main/java/ai/nets/samj/gui/MainGUI.java b/src/main/java/ai/nets/samj/gui/MainGUI.java
@@ -20,6 +20,7 @@
 import net.imglib2.type.numeric.IntegerType;
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.util.Cast;
+import net.imglib2.util.Util;
 
 import javax.swing.*;
 import javax.swing.border.EmptyBorder;
@@ -518,7 +519,7 @@ private < T extends RealType< T > & NativeType< T > > void batchSAMize() {
     	if (pointPrompts.size() == 0 && rectPrompts.size() == 0 && rai == null) {
         	lyt.show(cardPanel2_2, VISIBLE_STR);
     		return;
-    	} else if (pointPrompts.size() == 0 && rectPrompts.size() == 0 && !(rai.getType() instanceof IntegerType)){
+    	} else if (pointPrompts.size() == 0 && rectPrompts.size() == 0 && !(Util.getTypeFromInterval(rai) instanceof IntegerType)){
         	lyt.show(cardPanel2_2, VISIBLE_STR);
     		return;
     	}

diff --git a/src/main/java/ai/nets/samj/models/AbstractSamJ.java b/src/main/java/ai/nets/samj/models/AbstractSamJ.java
@@ -48,6 +48,7 @@
 import net.imglib2.type.numeric.IntegerType;
 import net.imglib2.type.numeric.RealType;
 import net.imglib2.util.Cast;
+import net.imglib2.util.Util;
 import net.imglib2.view.Views;
 
 /**
@@ -582,7 +583,7 @@ void checkPrompts(List<int[]> pointsList, List<Rectangle> rects, RandomAccessibl
 		long[] dims;
 		if ((pointsList == null || pointsList.size() == 0)
 				&& (rects == null || rects.size() == 0)
-				&& rai != null && !(rai.getType() instanceof IntegerType)) {
+				&& rai != null && !(Util.getTypeFromInterval(rai) instanceof IntegerType)) {
 			throw new IllegalArgumentException("The mask provided should be of any integer type.");
 		} else if ((pointsList == null || pointsList.size() == 0)
 				&& (rects == null || rects.size() == 0)