diff --git a/src/plugins/tprovoost/sequenceblocks/loop/SequenceFrameBatch.java b/src/plugins/tprovoost/sequenceblocks/loop/SequenceFrameBatch.java index cacc7290d9db5c40a8311ea1cd5f37416ce698f3..0737a24c90b4b4c36ab9692f875098398f82614f 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 23bbe64070ab78156b22a9a64bd4ada38aa212ad..4612efc37d930d0a0944c51631c5f7b009bf7ac3 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 0386775743c39f9960d4fa7994a48f3f34bccac2..c9e9d6a6d84c9dfdd4bec7853b60eb2e3fe293cc 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; }