update interfaces

segment-anything-models-java · Oct 25, 2024 · 07cef6c · 07cef6c
1 parent 1a300eb
commit 07cef6c
Show file tree

Hide file tree

Showing 10 changed files with 50 additions and 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
@@ -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<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -178,7 +178,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
 			Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -197,7 +197,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<Polygon> fetch2dSegmentation(Interval boundingBox2D) 
+	public List<Mask> fetch2dSegmentation(Interval boundingBox2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			//order to processBox() should be: x0,y0, x1,y1
@@ -218,7 +218,7 @@ public List<Polygon> fetch2dSegmentation(Interval boundingBox2D)
 	/**
 	 * {@inheritDoc}
 	 */
-	public <T extends RealType<T> & NativeType<T>> List<Polygon> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> rai) 
+	public <T extends RealType<T> & NativeType<T>> List<Mask> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> 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
@@ -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<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -174,7 +174,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	}
 
 	@Override
-	public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
 			Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -193,7 +193,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<Polygon> fetch2dSegmentation(Interval boundingBox2D) 
+	public List<Mask> fetch2dSegmentation(Interval boundingBox2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			//order to processBox() should be: x0,y0, x1,y1
@@ -214,7 +214,7 @@ public List<Polygon> fetch2dSegmentation(Interval boundingBox2D)
 	/**
 	 * {@inheritDoc}
 	 */
-	public <T extends RealType<T> & NativeType<T>> List<Polygon> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> rai) 
+	public <T extends RealType<T> & NativeType<T>> List<Mask> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> 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
@@ -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<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -174,7 +174,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	}
 
 	@Override
-	public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
 			Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -193,7 +193,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<Polygon> fetch2dSegmentation(Interval boundingBox2D) 
+	public List<Mask> fetch2dSegmentation(Interval boundingBox2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			//order to processBox() should be: x0,y0, x1,y1
@@ -214,7 +214,7 @@ public List<Polygon> fetch2dSegmentation(Interval boundingBox2D)
 	/**
 	 * {@inheritDoc}
 	 */
-	public <T extends RealType<T> & NativeType<T>> List<Polygon> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> rai) 
+	public <T extends RealType<T> & NativeType<T>> List<Mask> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> 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
@@ -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<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -173,7 +173,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	}
 
 	@Override
-	public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
 			Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -192,7 +192,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<Polygon> fetch2dSegmentation(Interval boundingBox2D) 
+	public List<Mask> fetch2dSegmentation(Interval boundingBox2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			//order to processBox() should be: x0,y0, x1,y1
@@ -213,7 +213,7 @@ public List<Polygon> fetch2dSegmentation(Interval boundingBox2D)
 	/**
 	 * {@inheritDoc}
 	 */
-	public <T extends RealType<T> & NativeType<T>> List<Polygon> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> rai) 
+	public <T extends RealType<T> & NativeType<T>> List<Mask> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> 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
@@ -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<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -173,7 +173,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	}
 
 	@Override
-	public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
 			Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -192,7 +192,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<Polygon> fetch2dSegmentation(Interval boundingBox2D) 
+	public List<Mask> fetch2dSegmentation(Interval boundingBox2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			//order to processBox() should be: x0,y0, x1,y1
@@ -213,7 +213,7 @@ public List<Polygon> fetch2dSegmentation(Interval boundingBox2D)
 	/**
 	 * {@inheritDoc}
 	 */
-	public <T extends RealType<T> & NativeType<T>> List<Polygon> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> rai) 
+	public <T extends RealType<T> & NativeType<T>> List<Mask> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> 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
@@ -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<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -175,7 +175,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	}
 
 	@Override
-	public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
 			Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -194,7 +194,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<Polygon> fetch2dSegmentation(Interval boundingBox2D) 
+	public List<Mask> fetch2dSegmentation(Interval boundingBox2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			//order to processBox() should be: x0,y0, x1,y1
@@ -215,7 +215,7 @@ public List<Polygon> fetch2dSegmentation(Interval boundingBox2D)
 	/**
 	 * {@inheritDoc}
 	 */
-	public <T extends RealType<T> & NativeType<T>> List<Polygon> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> rai) 
+	public <T extends RealType<T> & NativeType<T>> List<Mask> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> 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
@@ -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<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -177,7 +177,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
+	public List<Mask> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<Localizable> listOfNegPoints2D,
 			Rectangle zoomedRectangle) throws IOException, RuntimeException, InterruptedException {
 		try {
 			List<int[]> list = listOfPoints2D.stream()
@@ -196,7 +196,7 @@ public List<Polygon> fetch2dSegmentation(List<Localizable> listOfPoints2D, List<
 	/**
 	 * {@inheritDoc}
 	 */
-	public List<Polygon> fetch2dSegmentation(Interval boundingBox2D) 
+	public List<Mask> fetch2dSegmentation(Interval boundingBox2D) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			//order to processBox() should be: x0,y0, x1,y1
@@ -217,7 +217,7 @@ public List<Polygon> fetch2dSegmentation(Interval boundingBox2D)
 	/**
 	 * {@inheritDoc}
 	 */
-	public <T extends RealType<T> & NativeType<T>> List<Polygon> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> rai) 
+	public <T extends RealType<T> & NativeType<T>> List<Mask> fetch2dSegmentationFromMask(RandomAccessibleInterval<T> rai) 
 			throws IOException, InterruptedException, RuntimeException {
 		try {
 			return efficientSamJ.processMask(rai, !onlyBiggest);