From af0f34049332660ff030fe18014e66f28719122f Mon Sep 17 00:00:00 2001 From: Charles Mita Date: Fri, 24 Feb 2017 16:10:33 +0000 Subject: [PATCH] Restore Excluders in CompoundSpgIterator --- .../src/org/eclipse/scanning/points/CompoundSpgIterator.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/org.eclipse.scanning.points/src/org/eclipse/scanning/points/CompoundSpgIterator.java b/org.eclipse.scanning.points/src/org/eclipse/scanning/points/CompoundSpgIterator.java index 92800740d..ff3cc3ac6 100644 --- a/org.eclipse.scanning.points/src/org/eclipse/scanning/points/CompoundSpgIterator.java +++ b/org.eclipse.scanning.points/src/org/eclipse/scanning/points/CompoundSpgIterator.java @@ -14,7 +14,6 @@ import java.util.Collection; import java.util.Iterator; import java.util.LinkedList; -import java.util.List; import org.eclipse.dawnsci.analysis.dataset.roi.CircularROI; import org.eclipse.dawnsci.analysis.dataset.roi.EllipticalROI; @@ -70,7 +69,7 @@ public CompoundSpgIterator(CompoundGenerator gen) throws GeneratorException { JythonObjectFactory compoundGeneratorFactory = ScanPointGeneratorFactory.JCompoundGeneratorFactory(); - Object[] excluders = {}; //getExcluders(gen.getModel().getRegions()); TODO put back in when excluders are fixed in Python + Object[] excluders = getExcluders(gen.getModel().getRegions()); Object[] mutators = getMutators(gen.getModel().getMutators()); @SuppressWarnings("unchecked")