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=bd81bd01aac6e0683c2ec904c0987143a2578322;hb=0249f20bb127e61c58db4432b8609ff0cb441480;hp=d420edc71cd74abe5be18447a2c9cffe2aa0988c;hpb=0f88160c295af4ba04ce434bbe58ffea1d3d651d;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 d420edc7..bd81bd01 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,11 +3,15 @@ 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.List;
 
+import org.simantics.district.network.ui.adapters.DistrictNetworkEdgeElement;
 import org.simantics.district.network.ui.adapters.DistrictNetworkVertexElement;
+import org.simantics.district.network.ui.nodes.DistrictNetworkEdgeNode;
 import org.simantics.district.network.ui.nodes.DistrictNetworkVertexNode;
+import org.simantics.district.network.ui.nodes.HoverSensitiveNode;
 import org.simantics.district.network.ui.nodes.NetworkDrawingNode;
 import org.simantics.g2d.canvas.impl.DependencyReflection.Dependency;
 import org.simantics.g2d.canvas.impl.SGNodeReflection.SGInit;
@@ -18,12 +22,15 @@ import org.simantics.g2d.diagram.participant.AbstractDiagramParticipant;
 import org.simantics.g2d.element.IElement;
 import org.simantics.scenegraph.Node;
 import org.simantics.scenegraph.g2d.G2DParentNode;
+import org.simantics.scenegraph.g2d.IG2DNode;
 import org.simantics.utils.datastructures.hints.IHintContext.Key;
 import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
 
 public class NetworkDrawingParticipant extends AbstractDiagramParticipant {
 
-    @Dependency
+    public static final String NETWORK_DRAWING_NODE = "networkDrawingNode";
+
+	@Dependency
     PickContext pick;
     
     /**
@@ -48,7 +55,7 @@ public class NetworkDrawingParticipant extends AbstractDiagramParticipant {
 
     @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);
     }
@@ -58,30 +65,45 @@ public class NetworkDrawingParticipant extends AbstractDiagramParticipant {
         node.setDiagram(newDiagram);
     }
 
-    public boolean pickHoveredElement(Point2D currentMousePos) {
-        PickRequest req = new PickRequest(currentMousePos).context(getContext());
+    public boolean pickHoveredElement(Point2D currentMousePos, boolean isConnectionTool) {
+        PickRequest req = new PickRequest(new Rectangle2D.Double(currentMousePos.getX(), currentMousePos.getY(), 1e-8, 1e-8)).context(getContext());
         List<IElement> pickables = new ArrayList<IElement>();
         pick.pick(diagram, req, pickables);
         
         List<IElement> snap = new ArrayList<>(diagram.getSnapshot());
         
-        snap.removeAll(pickables);
+        // snap.removeAll(pickables);
         
         boolean changed = false;
-        for (IElement sn : snap) {
-            Node node = sn.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
+        changed = hoverVertexNodes(snap, false, isConnectionTool, changed, currentMousePos);
+        changed = hoverEdgeNodes(snap, false, isConnectionTool, changed, currentMousePos);
+        changed = hoverVertexNodes(pickables, true, isConnectionTool, changed, currentMousePos);
+        changed = hoverEdgeNodes(pickables, true, isConnectionTool, changed, currentMousePos);
+        return changed;
+    }
+
+    private boolean hoverVertexNodes(List<IElement> elements, boolean hover, boolean isConnectionTool, boolean changed, Point2D p) {
+        for (IElement elem : elements) {
+            Node node = elem.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
             if (node instanceof DistrictNetworkVertexNode) {
-                if (((DistrictNetworkVertexNode) node).hover(false) && !changed) {
-                    changed = true;
-                }
+                changed = ((DistrictNetworkVertexNode) node).hover(hover, isConnectionTool) || changed;
+                if (hover)
+                    ((DistrictNetworkVertexNode) node).setMousePosition(p);
             }
         }
-        
-        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 changed;
+    }
+    
+    private boolean hoverEdgeNodes(List<IElement> elements, boolean hover, boolean isConnectionTool, boolean changed, Point2D p) {
+        for (IElement elem : elements) {
+            Node node = elem.getHint(DistrictNetworkEdgeElement.KEY_DN_EDGE_NODE);
+            if (node instanceof DistrictNetworkEdgeNode) {
+                for (IG2DNode n : ((DistrictNetworkEdgeNode) node).getNodes()) {
+                    if (n instanceof HoverSensitiveNode) {
+                        changed = ((HoverSensitiveNode)n).hover(hover, isConnectionTool) || changed;
+                        if (hover)
+                            ((HoverSensitiveNode)n).setMousePosition(p);
+                    }
                 }
             }
         }