From fd0b255cfe70859288bd298e6160c3eb2d941197 Mon Sep 17 00:00:00 2001
From: Stephane Dallongeville <stephane@outlook.com>
Date: Tue, 11 Aug 2020 18:00:02 +0200
Subject: [PATCH] minors changes / fixes
---
.../loop/SequenceFrameBatch.java | 2 +-
.../loop/SequenceRegionBatch.java | 24 +++++++++++--------
.../loop/SequenceSliceBatch.java | 2 +-
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceFrameBatch.java b/src/plugins/tprovoost/sequenceblocks/loop/SequenceFrameBatch.java
index cacc729..0737a24 100644
--- a/src/plugins/tprovoost/sequenceblocks/loop/SequenceFrameBatch.java
+++ b/src/plugins/tprovoost/sequenceblocks/loop/SequenceFrameBatch.java
@@ -40,7 +40,7 @@ public class SequenceFrameBatch extends Batch implements PluginLibrary, PluginBu
{
// initialize element if needed
if (element == null)
- element = new VarSequence("Channel Sequence", null);
+ element = new VarSequence("Frame Sequence", null);
return element;
}
diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceRegionBatch.java b/src/plugins/tprovoost/sequenceblocks/loop/SequenceRegionBatch.java
index 23bbe64..4612efc 100644
--- a/src/plugins/tprovoost/sequenceblocks/loop/SequenceRegionBatch.java
+++ b/src/plugins/tprovoost/sequenceblocks/loop/SequenceRegionBatch.java
@@ -44,30 +44,33 @@ public class SequenceRegionBatch extends Batch implements SequenceBlock, PluginL
}
@Override
- public void declareInput(VarList inputMap)
+ public VarSequence getBatchElement()
{
- super.declareInput(inputMap);
- if (inputSequence == null)
- inputSequence = new VarSequence("Sequence", null);
+ if (element == null)
+ element = new VarSequence("Region Sequence", null);
- inputMap.add(inputSequence.getName(), inputSequence);
+ return element;
}
@Override
- public VarSequence getBatchElement()
+ public void declareInput(VarList inputMap)
{
- if (element == null)
- element = new VarSequence("Channel Sequence", null);
+ super.declareInput(inputMap);
- return element;
+ if (inputSequence == null)
+ inputSequence = new VarSequence("Sequence", null);
+
+ inputMap.add(inputSequence.getName(), inputSequence);
}
@Override
public void declareOutput(VarList outputMap)
{
super.declareOutput(outputMap);
+
if (currentRoi == null)
currentRoi = new VarROIArray("Current ROI");
+
outputMap.add(currentRoi.getName(), currentRoi);
}
@@ -87,7 +90,8 @@ public class SequenceRegionBatch extends Batch implements SequenceBlock, PluginL
public void beforeIteration()
{
// set result in element
- ROI roi = rois.getValue()[getIterationCounter().getValue().intValue()];
+ final ROI roi = rois.getValue()[getIterationCounter().getValue().intValue()];
+
element.setValue(SequenceUtil.getSubSequence(inputSequence.getValue(), roi));
currentRoi.setValue(new ROI[] {roi});
}
diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceSliceBatch.java b/src/plugins/tprovoost/sequenceblocks/loop/SequenceSliceBatch.java
index 0386775..c9e9d6a 100644
--- a/src/plugins/tprovoost/sequenceblocks/loop/SequenceSliceBatch.java
+++ b/src/plugins/tprovoost/sequenceblocks/loop/SequenceSliceBatch.java
@@ -41,7 +41,7 @@ public class SequenceSliceBatch extends Batch implements SequenceBlock, PluginLi
{
// initialize element if needed
if (element == null)
- element = new VarSequence("Channel Sequence", null);
+ element = new VarSequence("Slice Sequence", null);
return element;
}
--
GitLab