X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FNetworkDrawingParticipant.java;h=4ff231034935f30c3da0d694cde4debc56198e4e;hb=e6b35994e05232dd536af4da224a342c1bd090af;hp=c020c33d67e65abae9788aa9a3ea761e929c9e53;hpb=beab0411489f5730942d98d47dc3faf3107c6c02;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java
index c020c33d..4ff23103 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/NetworkDrawingParticipant.java
@@ -3,89 +3,132 @@ package org.simantics.district.network.ui;
 
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
+import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
+import java.util.Collections;
 import java.util.List;
 
+import org.simantics.db.Resource;
+import org.simantics.diagram.ui.DiagramModelHints;
+import org.simantics.district.network.ui.adapters.DistrictNetworkEdgeElement;
 import org.simantics.district.network.ui.adapters.DistrictNetworkVertexElement;
 import org.simantics.district.network.ui.nodes.DistrictNetworkVertexNode;
 import org.simantics.district.network.ui.nodes.NetworkDrawingNode;
+import org.simantics.district.network.ui.participants.DNPickSorter;
+import org.simantics.district.network.ui.participants.DynamicVisualisationContributionsParticipant;
 import org.simantics.g2d.canvas.impl.DependencyReflection.Dependency;
 import org.simantics.g2d.canvas.impl.SGNodeReflection.SGInit;
 import org.simantics.g2d.diagram.IDiagram;
 import org.simantics.g2d.diagram.handler.PickContext;
 import org.simantics.g2d.diagram.handler.PickRequest;
 import org.simantics.g2d.diagram.participant.AbstractDiagramParticipant;
+import org.simantics.g2d.element.ElementHints;
 import org.simantics.g2d.element.IElement;
+import org.simantics.maps.MapScalingTransform;
+import org.simantics.scenegraph.INode;
 import org.simantics.scenegraph.Node;
 import org.simantics.scenegraph.g2d.G2DParentNode;
-import org.simantics.utils.datastructures.hints.IHintContext.Key;
-import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
+import org.simantics.scenegraph.utils.GeometryUtils;
 
 public class NetworkDrawingParticipant extends AbstractDiagramParticipant {
 
+    public static final String NETWORK_DRAWING_NODE = "networkDrawingNode";
+
     @Dependency
     PickContext pick;
-    
-    /**
-     * A hint key for terminal pick distance in control pixels.
-     * @see #PICK_DIST
-     */
-    public static final Key KEY_PICK_DISTANCE = new KeyOf(Double.class, "PICK_DISTANCE");
+
+    private NetworkDrawingNode node;
+    private DynamicVisualisationContributionsParticipant dynamicVisualisationContributionsParticipant;
+    private AffineTransform transform;
 
     /**
-     * Default terminal pick distance in control pixels.
-     * @see #DEFAULT_PICK_DISTANCE
+     * Holds the current element for which hover information is shown.
+     * This exists only to optimize the hover updating procedure.
      */
-    public static final double PICK_DIST = 10;
-    
-    private NetworkDrawingNode node;
+    private IElement currentHoverElement;
 
-    private AffineTransform transform;
-    
-    public NetworkDrawingParticipant(AffineTransform transform) {
+    public NetworkDrawingParticipant(DynamicVisualisationContributionsParticipant dynamicVisualisationContributionsParticipant, AffineTransform transform) {
+        this.dynamicVisualisationContributionsParticipant = dynamicVisualisationContributionsParticipant;
         this.transform = transform;
     }
 
     @SGInit
     public void initSG(G2DParentNode parent) {
-        node = parent.addNode("networkDrawingNode", NetworkDrawingNode.class);
+        node = parent.addNode(NETWORK_DRAWING_NODE, NetworkDrawingNode.class);
         node.setTransform(transform);
         node.setNetworkDrawingParticipant(this);
     }
-    
+
     @Override
     protected void onDiagramSet(IDiagram newDiagram, IDiagram oldDiagram) {
         node.setDiagram(newDiagram);
     }
 
-    public boolean pickHoveredElement(Point2D currentMousePos) {
-        PickRequest req = new PickRequest(currentMousePos.getX(), currentMousePos.getY()).context(getContext());
-        List<IElement> pickables = new ArrayList<IElement>();
+    public boolean pickHoveredElement(Point2D canvasPos, boolean isConnectionTool, AffineTransform viewTransform) {
+        PickRequest req = new PickRequest(getPickRect(canvasPos, viewTransform)).context(getContext());
+        List<IElement> pickables = new ArrayList<>();
         pick.pick(diagram, req, pickables);
-        
-        List<IElement> snap = new ArrayList<>(diagram.getSnapshot());
-        
-        snap.removeAll(pickables);
-        
-        boolean changed = false;
-        for (IElement sn : snap) {
-            Node node = sn.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
-            if (node instanceof DistrictNetworkVertexNode) {
-                if (((DistrictNetworkVertexNode) node).hover(false) && !changed) {
-                    changed = true;
-                }
-            }
+
+        Collections.sort(pickables, DNPickSorter.nearestVerticesFirst(false, DNPickSorter.centerDistSq(canvasPos.getX(), canvasPos.getY())));
+
+        updateHoveredElement(pickables, true, isConnectionTool, viewTransform);
+        // Will repaint once the async hover info calculation is ready, no need to do it here
+        return false;
+    }
+
+    private boolean updateHoveredElement(List<IElement> elements, boolean hover, boolean isConnectionTool, AffineTransform viewTransform) {
+        if (elements == null || elements.isEmpty()) {
+            currentHoverElement = null;
+            return dynamicVisualisationContributionsParticipant.doHover(false, isConnectionTool);
+        } else {
+            dynamicVisualisationContributionsParticipant.doHover(true, isConnectionTool);
+
+            // we prefer the first picked element only
+            IElement elem = elements.get(0);
+            if (elem.equals(currentHoverElement))
+                return false;
+
+            INode node = elem.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
+            if (node == null)
+                node = elem.getHint(DistrictNetworkEdgeElement.KEY_DN_EDGE_NODE);
+            if (node == null)
+                return false;
+
+            Resource mapElement = elem.getHint(ElementHints.KEY_OBJECT);
+            Resource runtimeDiagram = diagram.getHint(DiagramModelHints.KEY_DIAGRAM_RUNTIME_RESOURCE);
+            currentHoverElement = elem;
+            dynamicVisualisationContributionsParticipant.hoverNode(runtimeDiagram, mapElement, node, MapScalingTransform.zoomLevel(viewTransform));
+            return true;
         }
-        
+    }
+
+    public boolean isHoveringOverNode(Point2D canvasPos, AffineTransform viewTransform) {
+        PickRequest req = new PickRequest(getPickRect(canvasPos, viewTransform)).context(getContext());
+        List<IElement> pickables = new ArrayList<>();
+        pick.pick(diagram, req, pickables);
         for (IElement elem : pickables) {
             Node node = elem.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
             if (node instanceof DistrictNetworkVertexNode) {
-                if (((DistrictNetworkVertexNode) node).hover(true) && !changed) {
-                    changed = true;
-                }
+                return true;
             }
         }
-        return changed;
+        return false;
+    }
+
+    private Rectangle2D getPickRect(Point2D canvasPos, AffineTransform viewTransform) {
+        double pixelScale = 1.0 / GeometryUtils.getScale(viewTransform);
+        if (Double.isInfinite(pixelScale))
+            pixelScale = 1e-8;
+
+        Rectangle2D pickRect = GeometryUtils.expandRectangle(
+                new Rectangle2D.Double(canvasPos.getX(), canvasPos.getY(), 0, 0),
+                pixelScale * 4);
+
+        return pickRect;
+    }
+
+    public AffineTransform getTransform() {
+        return transform;
     }
 
 }