From 07cef6cdae169e914086ecd60047a2a0f369cd56 Mon Sep 17 00:00:00 2001 From: carlosuc3m <100329787@alumnos.uc3m.es> Date: Fri, 25 Oct 2024 17:07:03 +0200 Subject: [PATCH] update interfaces --- .../ai/nets/samj/communication/model/EfficientSAM.java | 10 +++++----- .../samj/communication/model/EfficientViTSAML0.java | 10 +++++----- .../samj/communication/model/EfficientViTSAML1.java | 10 +++++----- .../samj/communication/model/EfficientViTSAML2.java | 10 +++++----- .../samj/communication/model/EfficientViTSAMXL0.java | 10 +++++----- .../samj/communication/model/EfficientViTSAMXL1.java | 10 +++++----- .../ai/nets/samj/communication/model/SAM2Large.java | 10 +++++----- .../ai/nets/samj/communication/model/SAM2Small.java | 10 +++++----- .../ai/nets/samj/communication/model/SAM2Tiny.java | 10 +++++----- .../ai/nets/samj/communication/model/SAMModel.java | 10 +++++----- 10 files changed, 50 insertions(+), 50 deletions(-) diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientSAM.java b/src/main/java/ai/nets/samj/communication/model/EfficientSAM.java index e047be1..ebac827 100644 --- a/src/main/java/ai/nets/samj/communication/model/EfficientSAM.java +++ b/src/main/java/ai/nets/samj/communication/model/EfficientSAM.java @@ -26,7 +26,6 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.util.Cast; -import java.awt.Polygon; import java.awt.Rectangle; import java.io.IOException; import java.util.List; @@ -35,6 +34,7 @@ import ai.nets.samj.models.AbstractSamJ; import ai.nets.samj.models.EfficientSamJ; +import ai.nets.samj.annotation.Mask; import ai.nets.samj.install.EfficientSamEnvManager; import ai.nets.samj.install.SamEnvManagerAbstract; import ai.nets.samj.ui.SAMJLogger; @@ -159,7 +159,7 @@ public void setInstalled(boolean installed) { /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) throws IOException, InterruptedException, RuntimeException { try { List list = listOfPoints2D.stream() @@ -178,7 +178,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException { try { List list = listOfPoints2D.stream() @@ -197,7 +197,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(Interval boundingBox2D) + public List fetch2dSegmentation(Interval boundingBox2D) throws IOException, InterruptedException, RuntimeException { try { //order to processBox() should be: x0,y0, x1,y1 @@ -218,7 +218,7 @@ public List fetch2dSegmentation(Interval boundingBox2D) /** * {@inheritDoc} */ - public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) + public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) throws IOException, InterruptedException, RuntimeException { try { return efficientSamJ.processMask(rai, !onlyBiggest); diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML0.java b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML0.java index e6bce33..522636b 100644 --- a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML0.java +++ b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML0.java @@ -26,7 +26,6 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.util.Cast; -import java.awt.Polygon; import java.awt.Rectangle; import java.io.IOException; import java.util.List; @@ -35,6 +34,7 @@ import ai.nets.samj.models.AbstractSamJ; import ai.nets.samj.models.EfficientViTSamJ; +import ai.nets.samj.annotation.Mask; import ai.nets.samj.install.EfficientViTSamEnvManager; import ai.nets.samj.install.SamEnvManagerAbstract; import ai.nets.samj.ui.SAMJLogger; @@ -158,7 +158,7 @@ public EfficientViTSAML0() throws IOException, RuntimeException, InterruptedExce /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) throws IOException, InterruptedException, RuntimeException { try { List list = listOfPoints2D.stream() @@ -174,7 +174,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< } @Override - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException { try { List list = listOfPoints2D.stream() @@ -193,7 +193,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(Interval boundingBox2D) + public List fetch2dSegmentation(Interval boundingBox2D) throws IOException, InterruptedException, RuntimeException { try { //order to processBox() should be: x0,y0, x1,y1 @@ -214,7 +214,7 @@ public List fetch2dSegmentation(Interval boundingBox2D) /** * {@inheritDoc} */ - public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) + public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) throws IOException, InterruptedException, RuntimeException { try { return efficientSamJ.processMask(rai, !onlyBiggest); diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML1.java b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML1.java index 3b6bdab..0493e49 100644 --- a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML1.java +++ b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML1.java @@ -26,13 +26,13 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.util.Cast; -import java.awt.Polygon; import java.awt.Rectangle; import java.io.IOException; import java.util.List; import java.util.Objects; import java.util.stream.Collectors; +import ai.nets.samj.annotation.Mask; import ai.nets.samj.install.EfficientViTSamEnvManager; import ai.nets.samj.install.SamEnvManagerAbstract; import ai.nets.samj.models.AbstractSamJ; @@ -158,7 +158,7 @@ public EfficientViTSAML1() throws IOException, RuntimeException, InterruptedExce /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) throws IOException, InterruptedException, RuntimeException { try { List list = listOfPoints2D.stream() @@ -174,7 +174,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< } @Override - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException { try { List list = listOfPoints2D.stream() @@ -193,7 +193,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(Interval boundingBox2D) + public List fetch2dSegmentation(Interval boundingBox2D) throws IOException, InterruptedException, RuntimeException { try { //order to processBox() should be: x0,y0, x1,y1 @@ -214,7 +214,7 @@ public List fetch2dSegmentation(Interval boundingBox2D) /** * {@inheritDoc} */ - public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) + public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) throws IOException, InterruptedException, RuntimeException { try { return efficientSamJ.processMask(rai, !onlyBiggest); diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML2.java b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML2.java index b7fd78c..364a459 100644 --- a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML2.java +++ b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAML2.java @@ -26,7 +26,6 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.util.Cast; -import java.awt.Polygon; import java.awt.Rectangle; import java.io.IOException; import java.util.List; @@ -35,6 +34,7 @@ import ai.nets.samj.models.AbstractSamJ; import ai.nets.samj.models.EfficientViTSamJ; +import ai.nets.samj.annotation.Mask; import ai.nets.samj.install.EfficientViTSamEnvManager; import ai.nets.samj.install.SamEnvManagerAbstract; import ai.nets.samj.ui.SAMJLogger; @@ -157,7 +157,7 @@ public EfficientViTSAML2() throws IOException, RuntimeException, InterruptedExce /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) throws IOException, InterruptedException, RuntimeException { try { List list = listOfPoints2D.stream() @@ -173,7 +173,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< } @Override - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException { try { List list = listOfPoints2D.stream() @@ -192,7 +192,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(Interval boundingBox2D) + public List fetch2dSegmentation(Interval boundingBox2D) throws IOException, InterruptedException, RuntimeException { try { //order to processBox() should be: x0,y0, x1,y1 @@ -213,7 +213,7 @@ public List fetch2dSegmentation(Interval boundingBox2D) /** * {@inheritDoc} */ - public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) + public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) throws IOException, InterruptedException, RuntimeException { try { return efficientSamJ.processMask(rai, !onlyBiggest); diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL0.java b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL0.java index 298aab9..7fb0007 100644 --- a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL0.java +++ b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL0.java @@ -26,7 +26,6 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.util.Cast; -import java.awt.Polygon; import java.awt.Rectangle; import java.io.IOException; import java.util.List; @@ -35,6 +34,7 @@ import ai.nets.samj.models.AbstractSamJ; import ai.nets.samj.models.EfficientViTSamJ; +import ai.nets.samj.annotation.Mask; import ai.nets.samj.install.EfficientViTSamEnvManager; import ai.nets.samj.install.SamEnvManagerAbstract; import ai.nets.samj.ui.SAMJLogger; @@ -157,7 +157,7 @@ public EfficientViTSAMXL0() throws IOException, RuntimeException, InterruptedExc /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) throws IOException, InterruptedException, RuntimeException { try { List list = listOfPoints2D.stream() @@ -173,7 +173,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< } @Override - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException { try { List list = listOfPoints2D.stream() @@ -192,7 +192,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(Interval boundingBox2D) + public List fetch2dSegmentation(Interval boundingBox2D) throws IOException, InterruptedException, RuntimeException { try { //order to processBox() should be: x0,y0, x1,y1 @@ -213,7 +213,7 @@ public List fetch2dSegmentation(Interval boundingBox2D) /** * {@inheritDoc} */ - public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) + public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) throws IOException, InterruptedException, RuntimeException { try { return efficientSamJ.processMask(rai, !onlyBiggest); diff --git a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL1.java b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL1.java index e646c3c..bbe33d8 100644 --- a/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL1.java +++ b/src/main/java/ai/nets/samj/communication/model/EfficientViTSAMXL1.java @@ -26,7 +26,6 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.util.Cast; -import java.awt.Polygon; import java.awt.Rectangle; import java.io.IOException; import java.util.List; @@ -35,6 +34,7 @@ import ai.nets.samj.models.AbstractSamJ; import ai.nets.samj.models.EfficientViTSamJ; +import ai.nets.samj.annotation.Mask; import ai.nets.samj.install.EfficientViTSamEnvManager; import ai.nets.samj.install.SamEnvManagerAbstract; import ai.nets.samj.ui.SAMJLogger; @@ -159,7 +159,7 @@ public EfficientViTSAMXL1() throws IOException, RuntimeException, InterruptedExc /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) throws IOException, InterruptedException, RuntimeException { try { List list = listOfPoints2D.stream() @@ -175,7 +175,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< } @Override - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException { try { List list = listOfPoints2D.stream() @@ -194,7 +194,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(Interval boundingBox2D) + public List fetch2dSegmentation(Interval boundingBox2D) throws IOException, InterruptedException, RuntimeException { try { //order to processBox() should be: x0,y0, x1,y1 @@ -215,7 +215,7 @@ public List fetch2dSegmentation(Interval boundingBox2D) /** * {@inheritDoc} */ - public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) + public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) throws IOException, InterruptedException, RuntimeException { try { return efficientSamJ.processMask(rai, !onlyBiggest); diff --git a/src/main/java/ai/nets/samj/communication/model/SAM2Large.java b/src/main/java/ai/nets/samj/communication/model/SAM2Large.java index 8fbdfe8..b1933c6 100644 --- a/src/main/java/ai/nets/samj/communication/model/SAM2Large.java +++ b/src/main/java/ai/nets/samj/communication/model/SAM2Large.java @@ -26,7 +26,6 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.util.Cast; -import java.awt.Polygon; import java.awt.Rectangle; import java.io.IOException; import java.util.List; @@ -35,6 +34,7 @@ import ai.nets.samj.models.AbstractSamJ; import ai.nets.samj.models.Sam2; +import ai.nets.samj.annotation.Mask; import ai.nets.samj.install.Sam2EnvManager; import ai.nets.samj.install.SamEnvManagerAbstract; import ai.nets.samj.ui.SAMJLogger; @@ -158,7 +158,7 @@ public void setInstalled(boolean installed) { /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) throws IOException, InterruptedException, RuntimeException { try { List list = listOfPoints2D.stream() @@ -177,7 +177,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException { try { List list = listOfPoints2D.stream() @@ -196,7 +196,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(Interval boundingBox2D) + public List fetch2dSegmentation(Interval boundingBox2D) throws IOException, InterruptedException, RuntimeException { try { //order to processBox() should be: x0,y0, x1,y1 @@ -217,7 +217,7 @@ public List fetch2dSegmentation(Interval boundingBox2D) /** * {@inheritDoc} */ - public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) + public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) throws IOException, InterruptedException, RuntimeException { try { return efficientSamJ.processMask(rai, !onlyBiggest); diff --git a/src/main/java/ai/nets/samj/communication/model/SAM2Small.java b/src/main/java/ai/nets/samj/communication/model/SAM2Small.java index 0f697f9..ca75387 100644 --- a/src/main/java/ai/nets/samj/communication/model/SAM2Small.java +++ b/src/main/java/ai/nets/samj/communication/model/SAM2Small.java @@ -26,7 +26,6 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.util.Cast; -import java.awt.Polygon; import java.awt.Rectangle; import java.io.IOException; import java.util.List; @@ -35,6 +34,7 @@ import ai.nets.samj.models.AbstractSamJ; import ai.nets.samj.models.Sam2; +import ai.nets.samj.annotation.Mask; import ai.nets.samj.install.Sam2EnvManager; import ai.nets.samj.install.SamEnvManagerAbstract; import ai.nets.samj.ui.SAMJLogger; @@ -159,7 +159,7 @@ public void setInstalled(boolean installed) { /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) throws IOException, InterruptedException, RuntimeException { try { List list = listOfPoints2D.stream() @@ -178,7 +178,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException { try { List list = listOfPoints2D.stream() @@ -197,7 +197,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(Interval boundingBox2D) + public List fetch2dSegmentation(Interval boundingBox2D) throws IOException, InterruptedException, RuntimeException { try { //order to processBox() should be: x0,y0, x1,y1 @@ -218,7 +218,7 @@ public List fetch2dSegmentation(Interval boundingBox2D) /** * {@inheritDoc} */ - public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) + public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) throws IOException, InterruptedException, RuntimeException { try { return efficientSamJ.processMask(rai, !onlyBiggest); diff --git a/src/main/java/ai/nets/samj/communication/model/SAM2Tiny.java b/src/main/java/ai/nets/samj/communication/model/SAM2Tiny.java index 678f0c8..e8e2aee 100644 --- a/src/main/java/ai/nets/samj/communication/model/SAM2Tiny.java +++ b/src/main/java/ai/nets/samj/communication/model/SAM2Tiny.java @@ -26,7 +26,6 @@ import net.imglib2.type.numeric.RealType; import net.imglib2.util.Cast; -import java.awt.Polygon; import java.awt.Rectangle; import java.io.IOException; import java.util.List; @@ -35,6 +34,7 @@ import ai.nets.samj.models.AbstractSamJ; import ai.nets.samj.models.Sam2; +import ai.nets.samj.annotation.Mask; import ai.nets.samj.install.Sam2EnvManager; import ai.nets.samj.install.SamEnvManagerAbstract; import ai.nets.samj.ui.SAMJLogger; @@ -157,7 +157,7 @@ public void setInstalled(boolean installed) { /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) throws IOException, InterruptedException, RuntimeException { try { List list = listOfPoints2D.stream() @@ -176,7 +176,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, + public List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException { try { List list = listOfPoints2D.stream() @@ -195,7 +195,7 @@ public List fetch2dSegmentation(List listOfPoints2D, List< /** * {@inheritDoc} */ - public List fetch2dSegmentation(Interval boundingBox2D) + public List fetch2dSegmentation(Interval boundingBox2D) throws IOException, InterruptedException, RuntimeException { try { //order to processBox() should be: x0,y0, x1,y1 @@ -216,7 +216,7 @@ public List fetch2dSegmentation(Interval boundingBox2D) /** * {@inheritDoc} */ - public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) + public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) throws IOException, InterruptedException, RuntimeException { try { return samj.processMask(rai, !onlyBiggest); diff --git a/src/main/java/ai/nets/samj/communication/model/SAMModel.java b/src/main/java/ai/nets/samj/communication/model/SAMModel.java index 4e85f92..ce21209 100644 --- a/src/main/java/ai/nets/samj/communication/model/SAMModel.java +++ b/src/main/java/ai/nets/samj/communication/model/SAMModel.java @@ -19,11 +19,11 @@ */ package ai.nets.samj.communication.model; -import java.awt.Polygon; import java.awt.Rectangle; import java.io.IOException; import java.util.List; +import ai.nets.samj.annotation.Mask; import ai.nets.samj.install.SamEnvManagerAbstract; import ai.nets.samj.ui.SAMJLogger; import net.imglib2.Interval; @@ -103,7 +103,7 @@ public interface SAMModel { * @throws RuntimeException if there is any error running the Python process * @throws InterruptedException if the process in interrupted */ - List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) throws IOException, RuntimeException, InterruptedException; + List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D) throws IOException, RuntimeException, InterruptedException; /** * Get a 2D segmentation/annotation using two lists of points as the prompts. @@ -119,7 +119,7 @@ public interface SAMModel { * @throws RuntimeException if there is any error running the Python process * @throws InterruptedException if the process in interrupted */ - List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException; + List fetch2dSegmentation(List listOfPoints2D, List listOfNegPoints2D, Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException; /** * Get a 2D segmentation/annotation using a bounding box as the prompt. @@ -130,7 +130,7 @@ public interface SAMModel { * @throws RuntimeException if there is any error running the Python process * @throws InterruptedException if the process in interrupted */ - List fetch2dSegmentation(Interval boundingBox2D) throws IOException, RuntimeException, InterruptedException; + List fetch2dSegmentation(Interval boundingBox2D) throws IOException, RuntimeException, InterruptedException; /** * Set whether SAMJ will only return the biggest ROI or all of them when several are obtained from the model @@ -150,7 +150,7 @@ public interface SAMModel { * @throws RuntimeException if there is any error running the Python process * @throws InterruptedException if the process in interrupted */ - public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) throws IOException, RuntimeException, InterruptedException; + public & NativeType> List fetch2dSegmentationFromMask(RandomAccessibleInterval rai) throws IOException, RuntimeException, InterruptedException; public String persistEncoding() throws IOException, InterruptedException;