change dtype and add flexibility to batch prompts

segment-anything-models-java · Nov 30, 2024 · 68e68ca · 68e68ca
1 parent 027ad06
commit 68e68ca
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/src/main/java/ai/nets/samj/gui/MainGUI.java b/src/main/java/ai/nets/samj/gui/MainGUI.java
@@ -437,12 +437,13 @@ private void toggleDrawer() {
 
     private < T extends RealType< T > & NativeType< T > > void batchSAMize() throws IOException, RuntimeException, InterruptedException {
     	RandomAccessibleInterval<T> rai = this.consumer.getFocusedImageAsRai();
-    	List<Object> prompts = new ArrayList<Object>();
-    	if (prompts.size() == 0 && !(rai.getType() instanceof IntegerType)){
+    	List<int[]> pointPrompts = this.consumer.getPointRoisOnFocusImage();
+    	List<Rectangle> rectPrompts = this.consumer.getRectRoisOnFocusImage();
+    	if (pointPrompts.size() == 0 && rectPrompts.size() == 0 && !(rai.getType() instanceof IntegerType)){
     		// TODO add label that is displayed when there are no prompts selected
     		return;
     	}
-    	this.consumer.addPolygonsFromGUI(this.cmbModels.getSelectedModel().fetch2dSegmentationFromMask(rai));
+    	this.consumer.addPolygonsFromGUI(this.cmbModels.getSelectedModel().processBatchOfPrompts(pointPrompts, rectPrompts, rai));
     }
 
     private void createListeners() {

diff --git a/src/main/java/ai/nets/samj/ui/ConsumerInterface.java b/src/main/java/ai/nets/samj/ui/ConsumerInterface.java
@@ -74,7 +74,7 @@ public abstract class ConsumerInterface {
 
 	public abstract < T extends RealType< T > & NativeType< T > > RandomAccessibleInterval<T> getFocusedImageAsRai();
 
-	public abstract List<long[]> getPointRoisOnFocusImage();
+	public abstract List<int[]> getPointRoisOnFocusImage();
 
 	public abstract List<Rectangle> getRectRoisOnFocusImage();