1 files changed, 211 insertions, 212 deletions
diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolLineVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolLineVisualization.java
index 3e66b4cd..b7296492 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolLineVisualization.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/parallel/selection/SelectionToolLineVisualization.java
@@ -58,21 +58,16 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.parallel.AbstractParallelVi
  * 
  * @author Robert Rödler
  * 
- * @apiviz.has SelectionResult oneway - - updates
- * @apiviz.has DBIDSelection oneway - - updates
+ * @apiviz.stereotype factory
+ * @apiviz.uses Instance - - «create»
  */
-public class SelectionToolLineVisualization extends AbstractParallelVisualization<NumberVector<?, ?>> implements DragableArea.DragListener {
+public class SelectionToolLineVisualization extends AbstractVisFactory {
   /**
    * A short name characterizing this Visualizer.
    */
   private static final String NAME = "Object Selection";
 
   /**
-   * CSS class of the selection rectangle while selecting.
-   */
-  private static final String CSS_RANGEMARKER = "selectionRangeMarker";
-
-  /**
    * Input modes
    * 
    * @apiviz.exclude
@@ -82,249 +77,253 @@ public class SelectionToolLineVisualization extends AbstractParallelVisualizatio
   }
 
   /**
-   * Element for selection rectangle
-   */
-  Element rtag;
-
-  /**
-   * Element for the rectangle to add listeners
-   */
-  Element etag;
-
-  /**
-   * Constructor.
-   * 
-   * @param task Task
+   * Constructor, adhering to
+   * {@link de.lmu.ifi.dbs.elki.utilities.optionhandling.Parameterizable}
    */
-  public SelectionToolLineVisualization(VisualizationTask task) {
-    super(task);
-    incrementalRedraw();
+  public SelectionToolLineVisualization() {
+    super();
   }
 
   @Override
-  protected void redraw() {
-    addCSSClasses(svgp);
-
-    rtag = svgp.svgElement(SVGConstants.SVG_G_TAG);
-    SVGUtil.addCSSClass(rtag, CSS_RANGEMARKER);
-    layer.appendChild(rtag);
+  public Visualization makeVisualization(VisualizationTask task) {
+    return new Instance(task);
+  }
 
-    // etag: sensitive area
-    DragableArea drag = new DragableArea(svgp, -.1 * getMarginLeft(), -.5 * getMarginTop(), getSizeX() + .2 * getMarginLeft(), getMarginTop() * 1.5 + getSizeY(), this);
-    etag = drag.getElement();
-    layer.appendChild(etag);
+  @Override
+  public void processNewResult(HierarchicalResult baseResult, Result result) {
+    Collection<SelectionResult> selectionResults = ResultUtil.filterResults(result, SelectionResult.class);
+    for(SelectionResult selres : selectionResults) {
+      Collection<ParallelPlotProjector<?>> ps = ResultUtil.filterResults(baseResult, ParallelPlotProjector.class);
+      for(ParallelPlotProjector<?> p : ps) {
+        final VisualizationTask task = new VisualizationTask(NAME, selres, p.getRelation(), this);
+        task.level = VisualizationTask.LEVEL_INTERACTIVE;
+        task.tool = true;
+        task.thumbnail = false;
+        task.noexport = true;
+        task.initDefaultVisibility(false);
+        baseResult.getHierarchy().add(selres, task);
+        baseResult.getHierarchy().add(p, task);
+      }
+    }
   }
 
   /**
-   * Delete the children of the element
+   * Instance.
+   * 
+   * @author Robert Rödler
    * 
-   * @param container SVG-Element
+   * @apiviz.has SelectionResult oneway - - updates
+   * @apiviz.has DBIDSelection oneway - - updates
    */
-  private void deleteChildren(Element container) {
-    while(container.hasChildNodes()) {
-      container.removeChild(container.getLastChild());
+  public class Instance extends AbstractParallelVisualization<NumberVector<?>> implements DragableArea.DragListener {
+    /**
+     * CSS class of the selection rectangle while selecting.
+     */
+    private static final String CSS_RANGEMARKER = "selectionRangeMarker";
+
+    /**
+     * Element for selection rectangle
+     */
+    Element rtag;
+
+    /**
+     * Element for the rectangle to add listeners
+     */
+    Element etag;
+
+    /**
+     * Constructor.
+     * 
+     * @param task Task
+     */
+    public Instance(VisualizationTask task) {
+      super(task);
+      incrementalRedraw();
     }
-  }
 
-  @Override
-  public boolean startDrag(SVGPoint startPoint, Event evt) {
-    return true;
-  }
+    @Override
+    protected void redraw() {
+      addCSSClasses(svgp);
 
-  @Override
-  public boolean duringDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
-    deleteChildren(rtag);
-    double x = Math.min(startPoint.getX(), dragPoint.getX());
-    double y = Math.min(startPoint.getY(), dragPoint.getY());
-    double width = Math.abs(startPoint.getX() - dragPoint.getX());
-    double height = Math.abs(startPoint.getY() - dragPoint.getY());
-    rtag.appendChild(svgp.svgRect(x, y, width, height));
-    return true;
-  }
+      rtag = svgp.svgElement(SVGConstants.SVG_G_TAG);
+      SVGUtil.addCSSClass(rtag, CSS_RANGEMARKER);
+      layer.appendChild(rtag);
 
-  @Override
-  public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
-    Mode mode = getInputMode(evt);
-    deleteChildren(rtag);
-    if(startPoint.getX() != dragPoint.getX() || startPoint.getY() != dragPoint.getY()) {
-      updateSelection(mode, startPoint, dragPoint);
+      // etag: sensitive area
+      DragableArea drag = new DragableArea(svgp, -.1 * getMarginLeft(), -.5 * getMarginTop(), getSizeX() + .2 * getMarginLeft(), getMarginTop() * 1.5 + getSizeY(), this);
+      etag = drag.getElement();
+      layer.appendChild(etag);
     }
-    return true;
-  }
 
-  /**
-   * Get the current input mode, on each mouse event.
-   * 
-   * @param evt Mouse event.
-   * @return current input mode
-   */
-  private Mode getInputMode(Event evt) {
-    if(evt instanceof DOMMouseEvent) {
-      DOMMouseEvent domme = (DOMMouseEvent) evt;
-      // TODO: visual indication of mode possible?
-      if(domme.getShiftKey()) {
-        return Mode.ADD;
-      }
-      else if(domme.getCtrlKey()) {
-        return Mode.INVERT;
-      }
-      else {
-        return Mode.REPLACE;
+    /**
+     * Delete the children of the element
+     * 
+     * @param container SVG-Element
+     */
+    private void deleteChildren(Element container) {
+      while(container.hasChildNodes()) {
+        container.removeChild(container.getLastChild());
       }
     }
-    // Default mode is replace.
-    return Mode.REPLACE;
-  }
 
-  /**
-   * Updates the selection in the context.<br>
-   * 
-   * @param mode Input mode
-   * @param p1 first point of the selected rectangle
-   * @param p2 second point of the selected rectangle
-   */
-  private void updateSelection(Mode mode, SVGPoint p1, SVGPoint p2) {
-    DBIDSelection selContext = context.getSelection();
-    // Note: we rely on SET semantics below!
-    final HashSetModifiableDBIDs selection;
-    if(selContext == null || mode == Mode.REPLACE) {
-      selection = DBIDUtil.newHashSet();
+    @Override
+    public boolean startDrag(SVGPoint startPoint, Event evt) {
+      return true;
     }
-    else {
-      selection = DBIDUtil.newHashSet(selContext.getSelectedIds());
+
+    @Override
+    public boolean duringDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
+      deleteChildren(rtag);
+      double x = Math.min(startPoint.getX(), dragPoint.getX());
+      double y = Math.min(startPoint.getY(), dragPoint.getY());
+      double width = Math.abs(startPoint.getX() - dragPoint.getX());
+      double height = Math.abs(startPoint.getY() - dragPoint.getY());
+      rtag.appendChild(svgp.svgRect(x, y, width, height));
+      return true;
     }
-    int[] axisrange = getAxisRange(Math.min(p1.getX(), p2.getX()), Math.max(p1.getX(), p2.getX()));
-    DBIDs ids = ResultUtil.getSamplingResult(relation).getSample();
-    for(DBIDIter iter = ids.iter(); iter.valid(); iter.advance()) {
-      double[] yPos = proj.fastProjectDataToRenderSpace(relation.get(iter));
-      if(checkSelected(axisrange, yPos, Math.max(p1.getX(), p2.getX()), Math.min(p1.getX(), p2.getX()), Math.max(p1.getY(), p2.getY()), Math.min(p1.getY(), p2.getY()))) {
-        if(mode == Mode.INVERT) {
-          if(!selection.contains(iter)) {
-            selection.add(iter);
-          }
-          else {
-            selection.remove(iter);
-          }
+
+    @Override
+    public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {
+      Mode mode = getInputMode(evt);
+      deleteChildren(rtag);
+      if(startPoint.getX() != dragPoint.getX() || startPoint.getY() != dragPoint.getY()) {
+        updateSelection(mode, startPoint, dragPoint);
+      }
+      return true;
+    }
+
+    /**
+     * Get the current input mode, on each mouse event.
+     * 
+     * @param evt Mouse event.
+     * @return current input mode
+     */
+    private Mode getInputMode(Event evt) {
+      if(evt instanceof DOMMouseEvent) {
+        DOMMouseEvent domme = (DOMMouseEvent) evt;
+        // TODO: visual indication of mode possible?
+        if(domme.getShiftKey()) {
+          return Mode.ADD;
+        }
+        else if(domme.getCtrlKey()) {
+          return Mode.INVERT;
         }
         else {
-          // In REPLACE and ADD, add objects.
-          // The difference was done before by not re-using the selection.
-          // Since we are using a set, we can just add in any case.
-          selection.add(iter);
+          return Mode.REPLACE;
         }
       }
+      // Default mode is replace.
+      return Mode.REPLACE;
     }
-    context.setSelection(new DBIDSelection(selection));
-  }
 
-  private int[] getAxisRange(double x1, double x2) {
-    final int dim = proj.getVisibleDimensions();
-    int minaxis = 0;
-    int maxaxis = 0;
-    boolean minx = true;
-    boolean maxx = false;
-    int count = -1;
-    for(int i = 0; i < dim; i++) {
-      if(minx && getVisibleAxisX(i) > x1) {
-        minaxis = count;
-        minx = false;
-        maxx = true;
+    /**
+     * Updates the selection in the context.<br>
+     * 
+     * @param mode Input mode
+     * @param p1 first point of the selected rectangle
+     * @param p2 second point of the selected rectangle
+     */
+    private void updateSelection(Mode mode, SVGPoint p1, SVGPoint p2) {
+      DBIDSelection selContext = context.getSelection();
+      // Note: we rely on SET semantics below!
+      final HashSetModifiableDBIDs selection;
+      if(selContext == null || mode == Mode.REPLACE) {
+        selection = DBIDUtil.newHashSet();
+      }
+      else {
+        selection = DBIDUtil.newHashSet(selContext.getSelectedIds());
       }
-      if(maxx && (getVisibleAxisX(i) > x2 || i == dim - 1)) {
-        maxaxis = count + 1;
-        if(i == dim - 1 && getVisibleAxisX(i) <= x2) {
-          maxaxis++;
+      int[] axisrange = getAxisRange(Math.min(p1.getX(), p2.getX()), Math.max(p1.getX(), p2.getX()));
+      DBIDs ids = ResultUtil.getSamplingResult(relation).getSample();
+      for(DBIDIter iter = ids.iter(); iter.valid(); iter.advance()) {
+        double[] yPos = proj.fastProjectDataToRenderSpace(relation.get(iter));
+        if(checkSelected(axisrange, yPos, Math.max(p1.getX(), p2.getX()), Math.min(p1.getX(), p2.getX()), Math.max(p1.getY(), p2.getY()), Math.min(p1.getY(), p2.getY()))) {
+          if(mode == Mode.INVERT) {
+            if(!selection.contains(iter)) {
+              selection.add(iter);
+            }
+            else {
+              selection.remove(iter);
+            }
+          }
+          else {
+            // In REPLACE and ADD, add objects.
+            // The difference was done before by not re-using the selection.
+            // Since we are using a set, we can just add in any case.
+            selection.add(iter);
+          }
         }
-        break;
       }
-      count = i;
+      context.setSelection(new DBIDSelection(selection));
     }
-    return new int[] { minaxis, maxaxis };
-  }
 
-  private boolean checkSelected(int[] ar, double[] yPos, double x1, double x2, double y1, double y2) {
-    final int dim = proj.getVisibleDimensions();
-    if (ar[0] < 0) {
-      ar[0] = 0;
-    }
-    if(ar[1] >= dim) {
-      ar[1] = dim - 1;
-    }
-    for(int i = ar[0] + 1; i <= ar[1] - 1; i++) {
-      if(yPos[i] <= y1 && yPos[i] >= y2) {
-        return true;
+    private int[] getAxisRange(double x1, double x2) {
+      final int dim = proj.getVisibleDimensions();
+      int minaxis = 0;
+      int maxaxis = 0;
+      boolean minx = true;
+      boolean maxx = false;
+      int count = -1;
+      for(int i = 0; i < dim; i++) {
+        if(minx && getVisibleAxisX(i) > x1) {
+          minaxis = count;
+          minx = false;
+          maxx = true;
+        }
+        if(maxx && (getVisibleAxisX(i) > x2 || i == dim - 1)) {
+          maxaxis = count + 1;
+          if(i == dim - 1 && getVisibleAxisX(i) <= x2) {
+            maxaxis++;
+          }
+          break;
+        }
+        count = i;
       }
+      return new int[] { minaxis, maxaxis };
     }
-    Line2D.Double idline1 = new Line2D.Double(getVisibleAxisX(ar[0]), yPos[ar[0]], getVisibleAxisX(ar[0] + 1), yPos[ar[0] + 1]);
-    Line2D.Double idline2 = new Line2D.Double(getVisibleAxisX(ar[1] - 1), yPos[ar[1] - 1], getVisibleAxisX(ar[1]), yPos[ar[1]]);
-    Line2D.Double rectline1 = new Line2D.Double(x2, y1, x1, y1);
-    Line2D.Double rectline2 = new Line2D.Double(x2, y1, x2, y2);
-    Line2D.Double rectline3 = new Line2D.Double(x2, y2, x1, y2);
-    if(idline1.intersectsLine(rectline1) || idline1.intersectsLine(rectline2) || idline1.intersectsLine(rectline3)) {
-      return true;
-    }
-    Line2D.Double rectline4 = new Line2D.Double(x1, y1, x1, y2);
-    if(idline2.intersectsLine(rectline1) || idline2.intersectsLine(rectline4) || idline2.intersectsLine(rectline3)) {
-      return true;
-    }
-    return false;
-  }
 
-  /**
-   * Adds the required CSS-Classes
-   * 
-   * @param svgp SVG-Plot
-   */
-  protected void addCSSClasses(SVGPlot svgp) {
-    // Class for the range marking
-    if(!svgp.getCSSClassManager().contains(CSS_RANGEMARKER)) {
-      final CSSClass rcls = new CSSClass(this, CSS_RANGEMARKER);
-      final StyleLibrary style = context.getStyleLibrary();
-      rcls.setStatement(SVGConstants.CSS_FILL_PROPERTY, style.getColor(StyleLibrary.SELECTION_ACTIVE));
-      rcls.setStatement(SVGConstants.CSS_OPACITY_PROPERTY, style.getOpacity(StyleLibrary.SELECTION_ACTIVE));
-      svgp.addCSSClassOrLogError(rcls);
+    private boolean checkSelected(int[] ar, double[] yPos, double x1, double x2, double y1, double y2) {
+      final int dim = proj.getVisibleDimensions();
+      if(ar[0] < 0) {
+        ar[0] = 0;
+      }
+      if(ar[1] >= dim) {
+        ar[1] = dim - 1;
+      }
+      for(int i = ar[0] + 1; i <= ar[1] - 1; i++) {
+        if(yPos[i] <= y1 && yPos[i] >= y2) {
+          return true;
+        }
+      }
+      Line2D.Double idline1 = new Line2D.Double(getVisibleAxisX(ar[0]), yPos[ar[0]], getVisibleAxisX(ar[0] + 1), yPos[ar[0] + 1]);
+      Line2D.Double idline2 = new Line2D.Double(getVisibleAxisX(ar[1] - 1), yPos[ar[1] - 1], getVisibleAxisX(ar[1]), yPos[ar[1]]);
+      Line2D.Double rectline1 = new Line2D.Double(x2, y1, x1, y1);
+      Line2D.Double rectline2 = new Line2D.Double(x2, y1, x2, y2);
+      Line2D.Double rectline3 = new Line2D.Double(x2, y2, x1, y2);
+      if(idline1.intersectsLine(rectline1) || idline1.intersectsLine(rectline2) || idline1.intersectsLine(rectline3)) {
+        return true;
+      }
+      Line2D.Double rectline4 = new Line2D.Double(x1, y1, x1, y2);
+      if(idline2.intersectsLine(rectline1) || idline2.intersectsLine(rectline4) || idline2.intersectsLine(rectline3)) {
+        return true;
+      }
+      return false;
     }
-  }
 
-  /**
-   * Factory for tool visualizations for selecting objects
-   * 
-   * @author Robert Rödler
-   * 
-   * @apiviz.stereotype factory
-   * @apiviz.uses SelectionToolLineVisualization - - «create»
-   * 
-   */
-  public static class Factory extends AbstractVisFactory {
     /**
-     * Constructor, adhering to
-     * {@link de.lmu.ifi.dbs.elki.utilities.optionhandling.Parameterizable}
+     * Adds the required CSS-Classes
+     * 
+     * @param svgp SVG-Plot
      */
-    public Factory() {
-      super();
-    }
-
-    @Override
-    public Visualization makeVisualization(VisualizationTask task) {
-      return new SelectionToolLineVisualization(task);
-    }
-
-    @Override
-    public void processNewResult(HierarchicalResult baseResult, Result result) {
-      Collection<SelectionResult> selectionResults = ResultUtil.filterResults(result, SelectionResult.class);
-      for(SelectionResult selres : selectionResults) {
-        Collection<ParallelPlotProjector<?>> ps = ResultUtil.filterResults(baseResult, ParallelPlotProjector.class);
-        for(ParallelPlotProjector<?> p : ps) {
-          final VisualizationTask task = new VisualizationTask(NAME, selres, p.getRelation(), this);
-          task.put(VisualizationTask.META_LEVEL, VisualizationTask.LEVEL_INTERACTIVE);
-          task.put(VisualizationTask.META_TOOL, true);
-          task.put(VisualizationTask.META_NOTHUMB, true);
-          task.put(VisualizationTask.META_NOEXPORT, true);
-          task.put(VisualizationTask.META_VISIBLE_DEFAULT, false);
-          baseResult.getHierarchy().add(selres, task);
-          baseResult.getHierarchy().add(p, task);
-        }
+    protected void addCSSClasses(SVGPlot svgp) {
+      // Class for the range marking
+      if(!svgp.getCSSClassManager().contains(CSS_RANGEMARKER)) {
+        final CSSClass rcls = new CSSClass(this, CSS_RANGEMARKER);
+        final StyleLibrary style = context.getStyleResult().getStyleLibrary();
+        rcls.setStatement(SVGConstants.CSS_FILL_PROPERTY, style.getColor(StyleLibrary.SELECTION_ACTIVE));
+        rcls.setStatement(SVGConstants.CSS_OPACITY_PROPERTY, style.getOpacity(StyleLibrary.SELECTION_ACTIVE));
+        svgp.addCSSClassOrLogError(rcls);
       }
     }
   }
-}
+}
+\ No newline at end of file