X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2FNetworkDrawingParticipant.java;h=69d1f724193fcbb797ae1eeb0edc403463758c81;hb=7ce96159ac6670ad4ba54f8faf93c167c35283fc;hp=aa11d6bb10205817145ed325e3f2c8a88cf948be;hpb=00e4eca98cef6d77d5023f4b424f9e8da0487463;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 aa11d6bb..69d1f724 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
@@ -16,8 +16,7 @@ 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.IElement;
-import org.simantics.maps.MapScalingTransform;
-import org.simantics.scenegraph.g2d.G2DNode;
+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;
@@ -60,7 +59,7 @@ public class NetworkDrawingParticipant extends AbstractDiagramParticipant {
     }
 
     public boolean pickHoveredElement(Point2D currentMousePos) {
-        PickRequest req = new PickRequest(currentMousePos.getX(), currentMousePos.getY());
+        PickRequest req = new PickRequest(currentMousePos).context(getContext());
         List<IElement> pickables = new ArrayList<IElement>();
         pick.pick(diagram, req, pickables);
         
@@ -70,7 +69,7 @@ public class NetworkDrawingParticipant extends AbstractDiagramParticipant {
         
         boolean changed = false;
         for (IElement sn : snap) {
-            G2DNode node = sn.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
+            Node node = sn.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
             if (node instanceof DistrictNetworkVertexNode) {
                 if (((DistrictNetworkVertexNode) node).hover(false) && !changed) {
                     changed = true;
@@ -79,7 +78,7 @@ public class NetworkDrawingParticipant extends AbstractDiagramParticipant {
         }
         
         for (IElement elem : pickables) {
-            G2DNode node = elem.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
+            Node node = elem.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
             if (node instanceof DistrictNetworkVertexNode) {
                 if (((DistrictNetworkVertexNode) node).hover(true) && !changed) {
                     changed = true;
@@ -89,4 +88,7 @@ public class NetworkDrawingParticipant extends AbstractDiagramParticipant {
         return changed;
     }
 
+    public AffineTransform getTransform() {
+        return transform;
+    }
 }