Import Upstream version 0.5.5

1 files changed, 135 insertions, 135 deletions

diff --git a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/selection/MoveObjectsToolVisualization.java b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/selection/MoveObjectsToolVisualization.java
index 6b466a88..c2282bf1 100644
--- a/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/selection/MoveObjectsToolVisualization.java
+++ b/src/de/lmu/ifi/dbs/elki/visualization/visualizers/scatterplot/selection/MoveObjectsToolVisualization.java
@@ -56,179 +56,179 @@ import de.lmu.ifi.dbs.elki.visualization.visualizers.scatterplot.AbstractScatter
  * @author Heidi Kolb

  * @author Erich Schubert

  * 

- * @apiviz.has NumberVector oneway - - edits

+ * @apiviz.stereotype factory

+ * @apiviz.uses Instance oneway - - «create»

  */

-public class MoveObjectsToolVisualization extends AbstractScatterplotVisualization implements DragListener {

+public class MoveObjectsToolVisualization extends AbstractVisFactory {

   /**

    * A short name characterizing this Visualizer.

    */

   private static final String NAME = "Move Objects";

 

   /**

-   * CSS tag for our event rectangle

+   * Constructor

    */

-  protected static final String CSS_ARROW = "moveArrow";

-

-  /**

-   * Element for the rectangle to add listeners

-   */

-  private Element etag;

-

-  /**

-   * Element to contain the drag arrow

-   */

-  private Element rtag;

-

-  /**

-   * Constructor.

-   * 

-   * @param task Task

-   */

-  public MoveObjectsToolVisualization(VisualizationTask task) {

-    super(task);

-    incrementalRedraw();

+  public MoveObjectsToolVisualization() {

+    super();

   }

 

   @Override

-  public void resultChanged(Result current) {

-    if(sample == current) {

-      synchronizedRedraw();

-    }

+  public Visualization makeVisualization(VisualizationTask task) {

+    return new Instance(task);

   }

 

   @Override

-  protected void redraw() {

-    addCSSClasses(svgp);

-

-    rtag = svgp.svgElement(SVGConstants.SVG_G_TAG);

-    SVGUtil.addCSSClass(rtag, CSS_ARROW);

-    layer.appendChild(rtag);

-

-    DragableArea drag = new DragableArea(svgp, -0.6 * StyleLibrary.SCALE, -0.7 * StyleLibrary.SCALE, 1.3 * StyleLibrary.SCALE, 1.4 * StyleLibrary.SCALE, this);

-    etag = drag.getElement();

-    layer.appendChild(etag);

+  public void processNewResult(HierarchicalResult baseResult, Result result) {

+    Collection<UpdatableDatabase> dbs = ResultUtil.filterResults(result, UpdatableDatabase.class);

+    if(dbs.isEmpty()) {

+      return;

+    }

+    Collection<ScatterPlotProjector<?>> ps = ResultUtil.filterResults(baseResult, ScatterPlotProjector.class);

+    for(ScatterPlotProjector<?> p : ps) {

+      final VisualizationTask task = new VisualizationTask(NAME, p.getRelation(), p.getRelation(), this);

+      task.level = VisualizationTask.LEVEL_INTERACTIVE;

+      task.tool = true;

+      task.thumbnail = false;

+      task.noexport = true;

+      task.initDefaultVisibility(false);

+      // baseResult.getHierarchy().add(p.getRelation(), task);

+      baseResult.getHierarchy().add(p, task);

+    }

   }

 

   /**

-   * Updates the objects with the given DBIDs It will be moved depending on the

-   * given Vector

+   * Instance.

+   * 

+   * @author Heidi Kolb

+   * @author Erich Schubert

    * 

-   * @param dbids - DBIDs of the objects to move

-   * @param movingVector - Vector for moving object

+   * @apiviz.has NumberVector oneway - - edits

    */

-  // TODO: move to DatabaseUtil?

-  private void updateDB(DBIDs dbids, Vector movingVector) {

-    NumberVector<?, ?> nv = null;

-    throw new AbortException("FIXME: INCOMPLETE TRANSITION");

-    /*

-     * database.accumulateDataStoreEvents();

-     * Representation<DatabaseObjectMetadata> mrep =

-     * database.getMetadataQuery(); for(DBID dbid : dbids) { NV obj =

-     * database.get(dbid); // Copy metadata to keep DatabaseObjectMetadata meta

-     * = mrep.get(dbid);

-     * 

-     * Vector v = proj.projectDataToRenderSpace(obj); v.set(0, v.get(0) +

-     * movingVector.get(0)); v.set(1, v.get(1) + movingVector.get(1)); NV nv =

-     * proj.projectRenderToDataSpace(v, obj); nv.setID(obj.getID());

-     * 

-     * try { database.delete(dbid); database.insert(new Pair<NV,

-     * DatabaseObjectMetadata>(nv, meta)); } catch(UnableToComplyException e) {

-     * de.lmu.ifi.dbs.elki.logging.LoggingUtil.exception(e); } }

-     * database.flushDataStoreEvents();

+  public class Instance extends AbstractScatterplotVisualization implements DragListener {

+    /**

+     * CSS tag for our event rectangle

      */

-  }

+    protected static final String CSS_ARROW = "moveArrow";

 

-  /**

-   * Delete the children of the element

-   * 

-   * @param container SVG-Element

-   */

-  private void deleteChildren(Element container) {

-    while(container.hasChildNodes()) {

-      container.removeChild(container.getLastChild());

+    /**

+     * Element for the rectangle to add listeners

+     */

+    private Element etag;

+

+    /**

+     * Element to contain the drag arrow

+     */

+    private Element rtag;

+

+    /**

+     * Constructor.

+     * 

+     * @param task Task

+     */

+    public Instance(VisualizationTask task) {

+      super(task);

+      incrementalRedraw();

     }

-  }

 

-  /**

-   * Adds the required CSS-Classes

-   * 

-   * @param svgp SVGPlot

-   */

-  private void addCSSClasses(SVGPlot svgp) {

-    // Class for the rectangle to add eventListeners

-    if(!svgp.getCSSClassManager().contains(CSS_ARROW)) {

-      final CSSClass acls = new CSSClass(this, CSS_ARROW);

-      final StyleLibrary style = context.getStyleLibrary();

-      acls.setStatement(SVGConstants.CSS_STROKE_PROPERTY, style.getColor(StyleLibrary.SELECTION_ACTIVE));

-      acls.setStatement(SVGConstants.CSS_STROKE_WIDTH_PROPERTY, style.getLineWidth(StyleLibrary.SELECTION_ACTIVE));

-      acls.setStatement(SVGConstants.CSS_STROKE_LINECAP_PROPERTY, SVGConstants.CSS_ROUND_VALUE);

-      svgp.addCSSClassOrLogError(acls);

+    @Override

+    public void resultChanged(Result current) {

+      if(sample == current) {

+        synchronizedRedraw();

+      }

     }

-  }

 

-  @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);

-    rtag.appendChild(svgp.svgLine(startPoint.getX(), startPoint.getY(), dragPoint.getX(), dragPoint.getY()));

-    return true;

-  }

+      rtag = svgp.svgElement(SVGConstants.SVG_G_TAG);

+      SVGUtil.addCSSClass(rtag, CSS_ARROW);

+      layer.appendChild(rtag);

 

-  @Override

-  public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {

-    Vector movingVector = new Vector(2);

-    movingVector.set(0, dragPoint.getX() - startPoint.getX());

-    movingVector.set(1, dragPoint.getY() - startPoint.getY());

-    if(context.getSelection() != null) {

-      updateDB(context.getSelection().getSelectedIds(), movingVector);

+      DragableArea drag = new DragableArea(svgp, -0.6 * StyleLibrary.SCALE, -0.7 * StyleLibrary.SCALE, 1.3 * StyleLibrary.SCALE, 1.4 * StyleLibrary.SCALE, this);

+      etag = drag.getElement();

+      layer.appendChild(etag);

     }

-    deleteChildren(rtag);

-    return true;

-  }

 

-  /**

-   * Factory for tool visualizations for changing objects in the database

-   * 

-   * @author Heidi Kolb

-   * @author Erich Schubert

-   * 

-   * @apiviz.stereotype factory

-   * @apiviz.uses MoveObjectsToolVisualization oneway - - «create»

-   */

-  public static class Factory extends AbstractVisFactory {

     /**

-     * Constructor

+     * Updates the objects with the given DBIDs It will be moved depending on

+     * the given Vector

+     * 

+     * @param dbids - DBIDs of the objects to move

+     * @param movingVector - Vector for moving object

      */

-    public Factory() {

-      super();

+    // TODO: move to DatabaseUtil?

+    private void updateDB(DBIDs dbids, Vector movingVector) {

+      NumberVector<?> nv = null;

+      throw new AbortException("FIXME: INCOMPLETE TRANSITION");

+      /*

+       * database.accumulateDataStoreEvents();

+       * Representation<DatabaseObjectMetadata> mrep =

+       * database.getMetadataQuery(); for(DBID dbid : dbids) { NV obj =

+       * database.get(dbid); // Copy metadata to keep DatabaseObjectMetadata

+       * meta = mrep.get(dbid);

+       * 

+       * Vector v = proj.projectDataToRenderSpace(obj); v.set(0, v.get(0) +

+       * movingVector.get(0)); v.set(1, v.get(1) + movingVector.get(1)); NV nv =

+       * proj.projectRenderToDataSpace(v, obj); nv.setID(obj.getID());

+       * 

+       * try { database.delete(dbid); database.insert(new Pair<NV,

+       * DatabaseObjectMetadata>(nv, meta)); } catch(UnableToComplyException e)

+       * { de.lmu.ifi.dbs.elki.logging.LoggingUtil.exception(e); } }

+       * database.flushDataStoreEvents();

+       */

+    }

+

+    /**

+     * Delete the children of the element

+     * 

+     * @param container SVG-Element

+     */

+    private void deleteChildren(Element container) {

+      while(container.hasChildNodes()) {

+        container.removeChild(container.getLastChild());

+      }

+    }

+

+    /**

+     * Adds the required CSS-Classes

+     * 

+     * @param svgp SVGPlot

+     */

+    private void addCSSClasses(SVGPlot svgp) {

+      // Class for the rectangle to add eventListeners

+      if(!svgp.getCSSClassManager().contains(CSS_ARROW)) {

+        final CSSClass acls = new CSSClass(this, CSS_ARROW);

+        final StyleLibrary style = context.getStyleResult().getStyleLibrary();

+        acls.setStatement(SVGConstants.CSS_STROKE_PROPERTY, style.getColor(StyleLibrary.SELECTION_ACTIVE));

+        acls.setStatement(SVGConstants.CSS_STROKE_WIDTH_PROPERTY, style.getLineWidth(StyleLibrary.SELECTION_ACTIVE));

+        acls.setStatement(SVGConstants.CSS_STROKE_LINECAP_PROPERTY, SVGConstants.CSS_ROUND_VALUE);

+        svgp.addCSSClassOrLogError(acls);

+      }

     }

 

     @Override

-    public Visualization makeVisualization(VisualizationTask task) {

-      return new MoveObjectsToolVisualization(task);

+    public boolean startDrag(SVGPoint startPoint, Event evt) {

+      return true;

     }

 

     @Override

-    public void processNewResult(HierarchicalResult baseResult, Result result) {

-      Collection<UpdatableDatabase> dbs = ResultUtil.filterResults(result, UpdatableDatabase.class);

-      if(dbs.isEmpty()) {

-        return;

-      }

-      Collection<ScatterPlotProjector<?>> ps = ResultUtil.filterResults(baseResult, ScatterPlotProjector.class);

-      for(ScatterPlotProjector<?> p : ps) {

-        final VisualizationTask task = new VisualizationTask(NAME, p.getRelation(), 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(p.getRelation(), task);

-        baseResult.getHierarchy().add(p, task);

+    public boolean duringDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {

+      deleteChildren(rtag);

+      rtag.appendChild(svgp.svgLine(startPoint.getX(), startPoint.getY(), dragPoint.getX(), dragPoint.getY()));

+      return true;

+    }

+

+    @Override

+    public boolean endDrag(SVGPoint startPoint, SVGPoint dragPoint, Event evt, boolean inside) {

+      Vector movingVector = new Vector(2);

+      movingVector.set(0, dragPoint.getX() - startPoint.getX());

+      movingVector.set(1, dragPoint.getY() - startPoint.getY());

+      if(context.getSelection() != null) {

+        updateDB(context.getSelection().getSelectedIds(), movingVector);

       }

+      deleteChildren(rtag);

+      return true;

     }

   }

 }
\ No newline at end of file