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=77ec735f6d2cc14c9f6013127244b6e82fac3ace;hb=4d0c114c0f53694180f808747b63d64fcefb0932;hp=da2bf32aec1a6ab3170e1386da2dddda8a2e9b7b;hpb=b018055e3c5809d33161154aebdc47f733721cdb;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 da2bf32a..77ec735f 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
@@ -7,18 +7,22 @@ import java.awt.geom.Rectangle2D;
 import java.util.ArrayList;
 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.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.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.scenegraph.Node;
 import org.simantics.scenegraph.g2d.G2DParentNode;
@@ -47,9 +51,11 @@ public class NetworkDrawingParticipant extends AbstractDiagramParticipant {
     
     private NetworkDrawingNode node;
 
+    private DynamicVisualisationContributionsParticipant dynamicVisualisationContributionsParticipant;
     private AffineTransform transform;
     
-    public NetworkDrawingParticipant(AffineTransform transform) {
+    public NetworkDrawingParticipant(DynamicVisualisationContributionsParticipant dynamicVisualisationContributionsParticipant, AffineTransform transform) {
+        this.dynamicVisualisationContributionsParticipant = dynamicVisualisationContributionsParticipant;
         this.transform = transform;
     }
 
@@ -72,10 +78,35 @@ public class NetworkDrawingParticipant extends AbstractDiagramParticipant {
 
         List<IElement> snap = diagram.getSnapshot();
 
-        boolean changed = false;
-        changed |= hoverNodes(snap, false, isConnectionTool, currentMousePos);
-        changed |= hoverNodes(pickables, true, isConnectionTool, currentMousePos);
-        return changed;
+        hoverNodes2(pickables, true, isConnectionTool, currentMousePos);
+        // we repaint ourselves once the async calulation is ready
+        return false;
+        
+//        boolean changed = false;
+//        changed |= hoverNodes(snap, false, isConnectionTool, currentMousePos);
+//        changed |= hoverNodes(pickables, true, isConnectionTool, currentMousePos);
+        //return changed;
+    }
+
+    private boolean hoverNodes2(List<IElement> elements, boolean hover, boolean isConnectionTool, Point2D p) {
+        if (elements == null || elements.isEmpty()) {
+            return dynamicVisualisationContributionsParticipant.doHover(false, isConnectionTool);
+        } else {
+            boolean changed = dynamicVisualisationContributionsParticipant.doHover(true, isConnectionTool);
+            if (changed) {
+                // we prefer the first picked element only
+                IElement elem = elements.get(0);
+                G2DParentNode node = elem.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
+                if (node instanceof DistrictNetworkVertexNode) {
+                } else {
+                    node = elem.getHint(DistrictNetworkEdgeElement.KEY_DN_EDGE_NODE);
+                }
+                Resource mapElement = elem.getHint(ElementHints.KEY_OBJECT);
+                Resource runtimeDiagram = diagram.getHint(DiagramModelHints.KEY_DIAGRAM_RUNTIME_RESOURCE);
+                dynamicVisualisationContributionsParticipant.hoverNode(runtimeDiagram, mapElement, node);
+            }
+            return changed;
+        }
     }
 
     private boolean hoverNodes(List<IElement> elements, boolean hover, boolean isConnectionTool, Point2D p) {