From 0c1418b9aa36e711a31bf21071a7533379418696 Mon Sep 17 00:00:00 2001
From: Stephane Dallongeville <stephane.dallongeville@pasteur.fr>
Date: Tue, 24 Jan 2023 14:59:34 +0100
Subject: [PATCH] updated to Icy 2.4.5 ROIDescriptor (bounds)
---
.../adufour/roi/ROIConvexHullDescriptor.java | 16 +------
.../roi/ROIEllipsoidFittingDescriptor.java | 48 +++----------------
.../roi/ROIHaralickTextureDescriptor.java | 32 ++-----------
.../adufour/roi/ROIRoundnessDescriptor.java | 16 +------
.../adufour/roi/ROISphericityDescriptor.java | 16 +------
5 files changed, 16 insertions(+), 112 deletions(-)
diff --git a/src/main/java/plugins/adufour/roi/ROIConvexHullDescriptor.java b/src/main/java/plugins/adufour/roi/ROIConvexHullDescriptor.java
index 0cd0898..f4be332 100644
--- a/src/main/java/plugins/adufour/roi/ROIConvexHullDescriptor.java
+++ b/src/main/java/plugins/adufour/roi/ROIConvexHullDescriptor.java
@@ -49,21 +49,9 @@ public class ROIConvexHullDescriptor extends Plugin implements PluginROIDescript
}
@Override
- public Object getNullValue()
+ public Object[] getBounds()
{
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMinValue()
- {
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMaxValue()
- {
- return Double.valueOf(100d);
+ return new Object[] {Double.valueOf(0d), Double.valueOf(100d)};
}
@Override
diff --git a/src/main/java/plugins/adufour/roi/ROIEllipsoidFittingDescriptor.java b/src/main/java/plugins/adufour/roi/ROIEllipsoidFittingDescriptor.java
index 1ce33f7..f5fd262 100644
--- a/src/main/java/plugins/adufour/roi/ROIEllipsoidFittingDescriptor.java
+++ b/src/main/java/plugins/adufour/roi/ROIEllipsoidFittingDescriptor.java
@@ -319,21 +319,9 @@ public class ROIEllipsoidFittingDescriptor extends Plugin implements PluginROIDe
}
@Override
- public Object getNullValue()
+ public Object[] getBounds()
{
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMinValue()
- {
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMaxValue()
- {
- return Double.valueOf(180d);
+ return new Object[] {Double.valueOf(0d), Double.valueOf(180d)};
}
@Override
@@ -396,21 +384,9 @@ public class ROIEllipsoidFittingDescriptor extends Plugin implements PluginROIDe
}
@Override
- public Object getNullValue()
+ public Object[] getBounds()
{
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMinValue()
- {
- return Double.valueOf(-180d);
- }
-
- @Override
- public Object getMaxValue()
- {
- return Double.valueOf(180d);
+ return new Object[] {Double.valueOf(-180d), Double.valueOf(180d)};
}
@Override
@@ -476,21 +452,9 @@ public class ROIEllipsoidFittingDescriptor extends Plugin implements PluginROIDe
}
@Override
- public Object getNullValue()
- {
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMinValue()
- {
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMaxValue()
+ public Object[] getBounds()
{
- return Double.valueOf(180d);
+ return new Object[] {Double.valueOf(0d), Double.valueOf(180d)};
}
@Override
diff --git a/src/main/java/plugins/adufour/roi/ROIHaralickTextureDescriptor.java b/src/main/java/plugins/adufour/roi/ROIHaralickTextureDescriptor.java
index 0251818..e7eab9d 100644
--- a/src/main/java/plugins/adufour/roi/ROIHaralickTextureDescriptor.java
+++ b/src/main/java/plugins/adufour/roi/ROIHaralickTextureDescriptor.java
@@ -62,21 +62,9 @@ public class ROIHaralickTextureDescriptor extends Plugin implements PluginROIDes
}
@Override
- public Object getNullValue()
+ public Object[] getBounds()
{
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMinValue()
- {
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMaxValue()
- {
- return Double.valueOf(1d);
+ return new Object[] {Double.valueOf(0d), Double.valueOf(1d)};
}
@Override
@@ -183,21 +171,9 @@ public class ROIHaralickTextureDescriptor extends Plugin implements PluginROIDes
}
@Override
- public Object getNullValue()
- {
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMinValue()
- {
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMaxValue()
+ public Object[] getBounds()
{
- return Double.valueOf(1d);
+ return new Object[] {Double.valueOf(0d), Double.valueOf(1d)};
}
@Override
diff --git a/src/main/java/plugins/adufour/roi/ROIRoundnessDescriptor.java b/src/main/java/plugins/adufour/roi/ROIRoundnessDescriptor.java
index c9f7126..53e8565 100644
--- a/src/main/java/plugins/adufour/roi/ROIRoundnessDescriptor.java
+++ b/src/main/java/plugins/adufour/roi/ROIRoundnessDescriptor.java
@@ -61,21 +61,9 @@ public class ROIRoundnessDescriptor extends Plugin implements PluginROIDescripto
}
@Override
- public Object getNullValue()
+ public Object[] getBounds()
{
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMinValue()
- {
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMaxValue()
- {
- return Double.valueOf(100d);
+ return new Object[] {Double.valueOf(0d), Double.valueOf(100d)};
}
@Override
diff --git a/src/main/java/plugins/adufour/roi/ROISphericityDescriptor.java b/src/main/java/plugins/adufour/roi/ROISphericityDescriptor.java
index 24b6dcd..aa72994 100644
--- a/src/main/java/plugins/adufour/roi/ROISphericityDescriptor.java
+++ b/src/main/java/plugins/adufour/roi/ROISphericityDescriptor.java
@@ -46,21 +46,9 @@ public class ROISphericityDescriptor extends Plugin implements PluginROIDescript
}
@Override
- public Object getNullValue()
+ public Object[] getBounds()
{
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMinValue()
- {
- return Double.valueOf(0d);
- }
-
- @Override
- public Object getMaxValue()
- {
- return Double.valueOf(100d);
+ return new Object[] {Double.valueOf(0d), Double.valueOf(100d)};
}
@Override
--
GitLab