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%2Fparticipants%2FDNPointerInteractor.java;h=298c4ce11e7be89c25f881cc6e1ca710b20f7b39;hb=refs%2Fchanges%2F86%2F2586%2F1;hp=acb0acacba55246f739a174c9d3d850de4835201;hpb=5747d0df198d3b3de66c51796369a7f6af314ea7;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNPointerInteractor.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNPointerInteractor.java
index acb0acac..298c4ce1 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNPointerInteractor.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/participants/DNPointerInteractor.java
@@ -11,8 +11,13 @@ import org.simantics.g2d.canvas.ICanvasParticipant;
 import org.simantics.g2d.diagram.handler.PickRequest.PickSorter;
 import org.simantics.g2d.diagram.participant.pointertool.PointerInteractor;
 import org.simantics.g2d.diagram.participant.pointertool.TerminalUtil.TerminalInfo;
+import org.simantics.g2d.element.ElementHints;
 import org.simantics.g2d.element.IElement;
-import org.simantics.scenegraph.g2d.G2DNode;
+import org.simantics.scenegraph.g2d.IG2DNode;
+import org.simantics.scenegraph.g2d.events.EventHandlerReflection.EventHandler;
+import org.simantics.scenegraph.g2d.events.KeyEvent.KeyReleasedEvent;
+import org.simantics.scenegraph.g2d.events.KeyEvent;
+import org.simantics.scenegraph.g2d.nodes.SingleElementNode;
 
 public class DNPointerInteractor extends PointerInteractor {
 
@@ -21,8 +26,8 @@ public class DNPointerInteractor extends PointerInteractor {
         @Override
         public void sort(List<IElement> elements) {
             Collections.sort(elements, (e1, e2) -> {
-                G2DNode e1node = getNode(e1);
-                G2DNode e2node = getNode(e2);
+                IG2DNode e1node = getNode(e1);
+                IG2DNode e2node = getNode(e2);
                 if (e1node.getZIndex() < e2node.getZIndex())
                     return -1;
                 else if (e1node.getZIndex() > e2node.getZIndex())
@@ -31,10 +36,17 @@ public class DNPointerInteractor extends PointerInteractor {
             });
         }
 
-        private static G2DNode getNode(IElement element) {
-            G2DNode node = element.getHint(DistrictNetworkEdgeElement.KEY_DN_EDGE_NODE);
+        private static IG2DNode getNode(IElement element) {
+            IG2DNode node = element.getHint(DistrictNetworkEdgeElement.KEY_DN_EDGE_NODE);
             if (node == null)
                 node = element.getHint(DistrictNetworkVertexElement.KEY_DN_VERTEX_NODE);
+            if (node == null) {
+                node = element.getHint(ElementHints.KEY_SG_NODE);
+                if (node instanceof SingleElementNode) {
+                    SingleElementNode snode = (SingleElementNode) node;
+                    node = snode.getNodes().iterator().next();
+                }
+            }
             return node;
         }
     }
@@ -53,4 +65,13 @@ public class DNPointerInteractor extends PointerInteractor {
             Set<IElement> elementsToDrag) {
         return new DNTranslateMode(startCanvasPos, curCanvasPos, mouseId, elementsToDrag);
     }
+
+    @EventHandler(priority = 1000)
+    public boolean enterroutingMode(KeyEvent ke) {
+        if (Character.toLowerCase(ke.character) == 't' && ke instanceof KeyReleasedEvent) {
+            getContext().add(new RoutingMode(0));
+        }
+        return false;
+    }
+
 }