1 files changed, 145 insertions, 148 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/selection/SelectionCubeVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/selection/SelectionCubeVisualization.java
index 5151e81e..6d4c14ab 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/selection/SelectionCubeVisualization.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/selection/SelectionCubeVisualization.java
@@ -28,13 +28,13 @@ import java.util.Collection;
 import org.apache.batik.util.SVGConstants;
 import org.w3c.dom.Element;
 
+import de.lmu.ifi.dbs.elki.database.relation.RelationUtil;
 import de.lmu.ifi.dbs.elki.result.DBIDSelection;
 import de.lmu.ifi.dbs.elki.result.HierarchicalResult;
 import de.lmu.ifi.dbs.elki.result.RangeSelection;
 import de.lmu.ifi.dbs.elki.result.Result;
 import de.lmu.ifi.dbs.elki.result.ResultUtil;
 import de.lmu.ifi.dbs.elki.result.SelectionResult;
-import de.lmu.ifi.dbs.elki.utilities.DatabaseUtil;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.AbstractParameterizer;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.OptionID;
 import de.lmu.ifi.dbs.elki.utilities.optionhandling.parameterization.Parameterization;
@@ -59,141 +59,179 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.thumbs.ThumbnailVisualizati
  * 
  * @author Heidi Kolb
  * 
- * @apiviz.has SelectionResult oneway - - visualizes
- * @apiviz.has RangeSelection oneway - - visualizes
- * @apiviz.uses SVGHyperCube
+ * @apiviz.stereotype factory
+ * @apiviz.uses Instance oneway - - «create»
  */
-public class SelectionCubeVisualization extends AbstractScatterplotVisualization {
+public class SelectionCubeVisualization extends AbstractVisFactory {
   /**
    * A short name characterizing this Visualizer.
    */
   private static final String NAME = "Selection Range";
 
   /**
-   * Generic tag to indicate the type of element. Used in IDs, CSS-Classes etc.
+   * Settings
    */
-  public static final String MARKER = "selectionCubeMarker";
+  protected Parameterizer settings;
 
   /**
-   * CSS class for the filled cube
-   */
-  public static final String CSS_CUBE = "selectionCube";
-
-  /**
-   * CSS class for the cube frame
-   */
-  public static final String CSS_CUBEFRAME = "selectionCubeFrame";
-
-  /**
-   * Fill parameter.
+   * Constructor.
+   * 
+   * @param settings Settings
    */
-  protected boolean nofill = false;
-
-  public SelectionCubeVisualization(VisualizationTask task, boolean nofill) {
-    super(task);
-    this.nofill = nofill;
-    addCSSClasses(svgp);
-    context.addResultListener(this);
-    incrementalRedraw();
+  public SelectionCubeVisualization(Parameterizer settings) {
+    super();
+    this.settings = settings;
+    thumbmask |= ThumbnailVisualization.ON_DATA | ThumbnailVisualization.ON_SELECTION;
   }
 
   @Override
-  public void destroy() {
-    context.removeResultListener(this);
-    super.destroy();
+  public Visualization makeVisualization(VisualizationTask task) {
+    return new Instance(task);
   }
 
-  /**
-   * Adds the required CSS-Classes
-   * 
-   * @param svgp SVG-Plot
-   */
-  private void addCSSClasses(SVGPlot svgp) {
-    final StyleLibrary style = context.getStyleLibrary();
-    // Class for the cube
-    if(!svgp.getCSSClassManager().contains(CSS_CUBE)) {
-      CSSClass cls = new CSSClass(this, CSS_CUBE);
-      cls.setStatement(SVGConstants.CSS_STROKE_VALUE, style.getColor(StyleLibrary.SELECTION));
-      cls.setStatement(SVGConstants.CSS_STROKE_OPACITY_PROPERTY, style.getOpacity(StyleLibrary.SELECTION));
-      cls.setStatement(SVGConstants.CSS_STROKE_WIDTH_PROPERTY, style.getLineWidth(StyleLibrary.PLOT));
-      cls.setStatement(SVGConstants.CSS_STROKE_LINECAP_PROPERTY, SVGConstants.CSS_ROUND_VALUE);
-      cls.setStatement(SVGConstants.CSS_STROKE_LINEJOIN_PROPERTY, SVGConstants.CSS_ROUND_VALUE);
-      if(nofill) {
-        cls.setStatement(SVGConstants.CSS_FILL_PROPERTY, SVGConstants.CSS_NONE_VALUE);
-      }
-      else {
-        cls.setStatement(SVGConstants.CSS_FILL_PROPERTY, style.getColor(StyleLibrary.SELECTION));
-        cls.setStatement(SVGConstants.CSS_FILL_OPACITY_PROPERTY, style.getOpacity(StyleLibrary.SELECTION));
+  @Override
+  public void processNewResult(HierarchicalResult baseResult, Result result) {
+    Collection<SelectionResult> selectionResults = ResultUtil.filterResults(result, SelectionResult.class);
+    for(SelectionResult selres : selectionResults) {
+      Collection<ScatterPlotProjector<?>> ps = ResultUtil.filterResults(baseResult, ScatterPlotProjector.class);
+      for(ScatterPlotProjector<?> p : ps) {
+        final VisualizationTask task = new VisualizationTask(NAME, selres, p.getRelation(), this);
+        task.level = VisualizationTask.LEVEL_DATA - 2;
+        baseResult.getHierarchy().add(selres, task);
+        baseResult.getHierarchy().add(p, task);
       }
-      svgp.addCSSClassOrLogError(cls);
-    }
-    // Class for the cube frame
-    if(!svgp.getCSSClassManager().contains(CSS_CUBEFRAME)) {
-      CSSClass cls = new CSSClass(this, CSS_CUBEFRAME);
-      cls.setStatement(SVGConstants.CSS_STROKE_VALUE, style.getColor(StyleLibrary.SELECTION));
-      cls.setStatement(SVGConstants.CSS_STROKE_OPACITY_PROPERTY, style.getOpacity(StyleLibrary.SELECTION));
-      cls.setStatement(SVGConstants.CSS_STROKE_WIDTH_PROPERTY, style.getLineWidth(StyleLibrary.SELECTION));
-
-      svgp.addCSSClassOrLogError(cls);
     }
   }
 
   /**
-   * Generates a cube and a frame depending on the selection stored in the
-   * context
+   * Instance.
+   * 
+   * @author Heidi Kolb
    * 
-   * @param svgp The plot
-   * @param proj The projection
+   * @apiviz.has SelectionResult oneway - - visualizes
+   * @apiviz.has RangeSelection oneway - - visualizes
+   * @apiviz.uses SVGHyperCube
    */
-  private void setSVGRect(SVGPlot svgp, Projection2D proj) {
-    DBIDSelection selContext = context.getSelection();
-    if(selContext instanceof RangeSelection) {
-      DoubleDoublePair[] ranges = ((RangeSelection) selContext).getRanges();
-      int dim = DatabaseUtil.dimensionality(rel);
+  public class Instance extends AbstractScatterplotVisualization {
+    /**
+     * Generic tag to indicate the type of element. Used in IDs, CSS-Classes
+     * etc.
+     */
+    public static final String MARKER = "selectionCubeMarker";
+
+    /**
+     * CSS class for the filled cube
+     */
+    public static final String CSS_CUBE = "selectionCube";
+
+    /**
+     * CSS class for the cube frame
+     */
+    public static final String CSS_CUBEFRAME = "selectionCubeFrame";
+
+    public Instance(VisualizationTask task) {
+      super(task);
+      addCSSClasses(svgp);
+      context.addResultListener(this);
+      incrementalRedraw();
+    }
 
-      double[] min = new double[dim];
-      double[] max = new double[dim];
-      for(int d = 0; d < dim; d++) {
-        if(ranges != null && ranges[d] != null) {
-          min[d] = ranges[d].first;
-          max[d] = ranges[d].second;
+    @Override
+    public void destroy() {
+      context.removeResultListener(this);
+      super.destroy();
+    }
+
+    /**
+     * Adds the required CSS-Classes
+     * 
+     * @param svgp SVG-Plot
+     */
+    private void addCSSClasses(SVGPlot svgp) {
+      final StyleLibrary style = context.getStyleResult().getStyleLibrary();
+      // Class for the cube
+      if(!svgp.getCSSClassManager().contains(CSS_CUBE)) {
+        CSSClass cls = new CSSClass(this, CSS_CUBE);
+        cls.setStatement(SVGConstants.CSS_STROKE_VALUE, style.getColor(StyleLibrary.SELECTION));
+        cls.setStatement(SVGConstants.CSS_STROKE_OPACITY_PROPERTY, style.getOpacity(StyleLibrary.SELECTION));
+        cls.setStatement(SVGConstants.CSS_STROKE_WIDTH_PROPERTY, style.getLineWidth(StyleLibrary.PLOT));
+        cls.setStatement(SVGConstants.CSS_STROKE_LINECAP_PROPERTY, SVGConstants.CSS_ROUND_VALUE);
+        cls.setStatement(SVGConstants.CSS_STROKE_LINEJOIN_PROPERTY, SVGConstants.CSS_ROUND_VALUE);
+        if(settings.nofill) {
+          cls.setStatement(SVGConstants.CSS_FILL_PROPERTY, SVGConstants.CSS_NONE_VALUE);
         }
         else {
-          min[d] = proj.getScale(d).getMin();
-          max[d] = proj.getScale(d).getMax();
+          cls.setStatement(SVGConstants.CSS_FILL_PROPERTY, style.getColor(StyleLibrary.SELECTION));
+          cls.setStatement(SVGConstants.CSS_FILL_OPACITY_PROPERTY, style.getOpacity(StyleLibrary.SELECTION));
         }
+        svgp.addCSSClassOrLogError(cls);
       }
-      if(nofill) {
-        Element r = SVGHyperCube.drawFrame(svgp, proj, min, max);
-        SVGUtil.setCSSClass(r, CSS_CUBEFRAME);
-        layer.appendChild(r);
-      }
-      else {
-        Element r = SVGHyperCube.drawFilled(svgp, CSS_CUBE, proj, min, max);
-        layer.appendChild(r);
+      // Class for the cube frame
+      if(!svgp.getCSSClassManager().contains(CSS_CUBEFRAME)) {
+        CSSClass cls = new CSSClass(this, CSS_CUBEFRAME);
+        cls.setStatement(SVGConstants.CSS_STROKE_VALUE, style.getColor(StyleLibrary.SELECTION));
+        cls.setStatement(SVGConstants.CSS_STROKE_OPACITY_PROPERTY, style.getOpacity(StyleLibrary.SELECTION));
+        cls.setStatement(SVGConstants.CSS_STROKE_WIDTH_PROPERTY, style.getLineWidth(StyleLibrary.SELECTION));
+
+        svgp.addCSSClassOrLogError(cls);
       }
+    }
+
+    /**
+     * Generates a cube and a frame depending on the selection stored in the
+     * context
+     * 
+     * @param svgp The plot
+     * @param proj The projection
+     */
+    private void setSVGRect(SVGPlot svgp, Projection2D proj) {
+      DBIDSelection selContext = context.getSelection();
+      if(selContext instanceof RangeSelection) {
+        DoubleDoublePair[] ranges = ((RangeSelection) selContext).getRanges();
+        int dim = RelationUtil.dimensionality(rel);
+
+        double[] min = new double[dim];
+        double[] max = new double[dim];
+        for(int d = 0; d < dim; d++) {
+          if(ranges != null && ranges[d] != null) {
+            min[d] = ranges[d].first;
+            max[d] = ranges[d].second;
+          }
+          else {
+            min[d] = proj.getScale(d).getMin();
+            max[d] = proj.getScale(d).getMax();
+          }
+        }
+        if(settings.nofill) {
+          Element r = SVGHyperCube.drawFrame(svgp, proj, min, max);
+          SVGUtil.setCSSClass(r, CSS_CUBEFRAME);
+          layer.appendChild(r);
+        }
+        else {
+          Element r = SVGHyperCube.drawFilled(svgp, CSS_CUBE, proj, min, max);
+          layer.appendChild(r);
+        }
 
+      }
     }
-  }
 
-  @Override
-  protected void redraw() {
-    DBIDSelection selContext = context.getSelection();
-    if(selContext != null && selContext instanceof RangeSelection) {
-      setSVGRect(svgp, proj);
+    @Override
+    protected void redraw() {
+      DBIDSelection selContext = context.getSelection();
+      if(selContext instanceof RangeSelection) {
+        setSVGRect(svgp, proj);
+      }
     }
   }
 
   /**
-   * Factory for visualizers to generate an SVG-Element containing a cube as
-   * marker representing the selected range for each dimension
+   * Parameterization class.
    * 
-   * @author Heidi Kolb
+   * @author Erich Schubert
    * 
-   * @apiviz.stereotype factory
-   * @apiviz.uses SelectionCubeVisualization oneway - - «create»
+   * @apiviz.exclude
    */
-  public static class Factory extends AbstractVisFactory {
+  public static class Parameterizer extends AbstractParameterizer {
     /**
      * Flag for half-transparent filling of selection cubes.
      * 
@@ -201,66 +239,25 @@ public class SelectionCubeVisualization extends AbstractScatterplotVisualization
      * Key: {@code -selectionrange.nofill}
      * </p>
      */
-    public static final OptionID NOFILL_ID = OptionID.getOrCreateOptionID("selectionrange.nofill", "Use wireframe style for selection ranges.");
+    public static final OptionID NOFILL_ID = new OptionID("selectionrange.nofill", "Use wireframe style for selection ranges.");
 
     /**
      * Fill parameter.
      */
-    protected boolean nofill = false;
-
-    /**
-     * Constructor.
-     * 
-     * @param nofill
-     */
-    public Factory(boolean nofill) {
-      super();
-      this.nofill = nofill;
-      thumbmask |= ThumbnailVisualization.ON_DATA | ThumbnailVisualization.ON_SELECTION;
-    }
+    protected boolean nofill;
 
     @Override
-    public Visualization makeVisualization(VisualizationTask task) {
-      return new SelectionCubeVisualization(task, nofill);
-    }
-
-    @Override
-    public void processNewResult(HierarchicalResult baseResult, Result result) {
-      Collection<SelectionResult> selectionResults = ResultUtil.filterResults(result, SelectionResult.class);
-      for(SelectionResult selres : selectionResults) {
-        Collection<ScatterPlotProjector<?>> ps = ResultUtil.filterResults(baseResult, ScatterPlotProjector.class);
-        for(ScatterPlotProjector<?> p : ps) {
-          final VisualizationTask task = new VisualizationTask(NAME, selres, p.getRelation(), this);
-          task.put(VisualizationTask.META_LEVEL, VisualizationTask.LEVEL_DATA - 2);
-          baseResult.getHierarchy().add(selres, task);
-          baseResult.getHierarchy().add(p, task);
-        }
+    protected void makeOptions(Parameterization config) {
+      super.makeOptions(config);
+      Flag nofillF = new Flag(NOFILL_ID);
+      if(config.grab(nofillF)) {
+        nofill = nofillF.isTrue();
       }
     }
 
-    /**
-     * Parameterization class.
-     * 
-     * @author Erich Schubert
-     * 
-     * @apiviz.exclude
-     */
-    public static class Parameterizer extends AbstractParameterizer {
-      protected boolean nofill;
-
-      @Override
-      protected void makeOptions(Parameterization config) {
-        super.makeOptions(config);
-        Flag nofillF = new Flag(NOFILL_ID);
-        if(config.grab(nofillF)) {
-          nofill = nofillF.getValue();
-        }
-      }
-
-      @Override
-      protected Factory makeInstance() {
-        return new Factory(nofill);
-      }
+    @Override
+    protected SelectionCubeVisualization makeInstance() {
+      return new SelectionCubeVisualization(this);
     }
   }
 }
 \ No newline at end of file