From 406119cb899a5af8ac1c87ef8d53b2c75bfde4ec Mon Sep 17 00:00:00 2001
From: Stephane Dallongeville <stephane.dallongeville@pasteur.fr>
Date: Fri, 20 Jan 2023 14:17:28 +0100
Subject: [PATCH] ready for Icy 2.4.5 ROIDescriptor (min/max/null value)
---
.../roi/ROIEllipsoidFittingDescriptor.java | 54 +++++++++++++++++++
.../roi/ROIHaralickTextureDescriptor.java | 39 +++++++++++++-
2 files changed, 91 insertions(+), 2 deletions(-)
diff --git a/src/main/java/plugins/adufour/roi/ROIEllipsoidFittingDescriptor.java b/src/main/java/plugins/adufour/roi/ROIEllipsoidFittingDescriptor.java
index 49c57c4..1ce33f7 100644
--- a/src/main/java/plugins/adufour/roi/ROIEllipsoidFittingDescriptor.java
+++ b/src/main/java/plugins/adufour/roi/ROIEllipsoidFittingDescriptor.java
@@ -318,6 +318,24 @@ public class ROIEllipsoidFittingDescriptor extends Plugin implements PluginROIDe
return "\u00B0";
}
+ @Override
+ public Object getNullValue()
+ {
+ return Double.valueOf(0d);
+ }
+
+ @Override
+ public Object getMinValue()
+ {
+ return Double.valueOf(0d);
+ }
+
+ @Override
+ public Object getMaxValue()
+ {
+ return Double.valueOf(180d);
+ }
+
@Override
public Object compute(ROI roi, Sequence sequence) throws UnsupportedOperationException, InterruptedException
{
@@ -377,6 +395,24 @@ public class ROIEllipsoidFittingDescriptor extends Plugin implements PluginROIDe
return "\u00B0";
}
+ @Override
+ public Object getNullValue()
+ {
+ return Double.valueOf(0d);
+ }
+
+ @Override
+ public Object getMinValue()
+ {
+ return Double.valueOf(-180d);
+ }
+
+ @Override
+ public Object getMaxValue()
+ {
+ return Double.valueOf(180d);
+ }
+
@Override
public Object compute(ROI roi, Sequence sequence) throws UnsupportedOperationException, InterruptedException
{
@@ -439,6 +475,24 @@ public class ROIEllipsoidFittingDescriptor extends Plugin implements PluginROIDe
return "\u00B0";
}
+ @Override
+ public Object getNullValue()
+ {
+ return Double.valueOf(0d);
+ }
+
+ @Override
+ public Object getMinValue()
+ {
+ return Double.valueOf(0d);
+ }
+
+ @Override
+ public Object getMaxValue()
+ {
+ return Double.valueOf(180d);
+ }
+
@Override
public Object compute(ROI roi, Sequence sequence) throws UnsupportedOperationException, InterruptedException
{
diff --git a/src/main/java/plugins/adufour/roi/ROIHaralickTextureDescriptor.java b/src/main/java/plugins/adufour/roi/ROIHaralickTextureDescriptor.java
index e3dd171..0251818 100644
--- a/src/main/java/plugins/adufour/roi/ROIHaralickTextureDescriptor.java
+++ b/src/main/java/plugins/adufour/roi/ROIHaralickTextureDescriptor.java
@@ -61,6 +61,24 @@ public class ROIHaralickTextureDescriptor extends Plugin implements PluginROIDes
return true;
}
+ @Override
+ public Object getNullValue()
+ {
+ return Double.valueOf(0d);
+ }
+
+ @Override
+ public Object getMinValue()
+ {
+ return Double.valueOf(0d);
+ }
+
+ @Override
+ public Object getMaxValue()
+ {
+ return Double.valueOf(1d);
+ }
+
@Override
public Object compute(ROI roi, Sequence sequence) throws UnsupportedOperationException, InterruptedException
{
@@ -164,6 +182,24 @@ public class ROIHaralickTextureDescriptor extends Plugin implements PluginROIDes
return true;
}
+ @Override
+ public Object getNullValue()
+ {
+ return Double.valueOf(0d);
+ }
+
+ @Override
+ public Object getMinValue()
+ {
+ return Double.valueOf(0d);
+ }
+
+ @Override
+ public Object getMaxValue()
+ {
+ return Double.valueOf(1d);
+ }
+
@Override
public Object compute(ROI roi, Sequence sequence) throws UnsupportedOperationException, InterruptedException
{
@@ -216,8 +252,7 @@ public class ROIHaralickTextureDescriptor extends Plugin implements PluginROIDes
* (see {@link #getDescriptors()}) for a full list
* @throws InterruptedException
*/
- public static Map<ROIDescriptor, Object> computeHaralickFeatures(Sequence sequence, ROI2D roi, int step)
- throws InterruptedException
+ public static Map<ROIDescriptor, Object> computeHaralickFeatures(Sequence sequence, ROI2D roi, int step) throws InterruptedException
{
int c = roi.getC();
if (c == -1)
--
GitLab