X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fparticipants%2FDNPointerInteractor.java;h=770a3b4ef4b4f309929fbddf8248f17eeef0a5ed;hb=3424ba8b4dd8e368badce8515bca96a99be518f4;hp=ac90af7fb08b79b457231d50958d6be06935aa8d;hpb=716ce6c9abe27be04635922ad437f242c4bd7dfc;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 ac90af7f..770a3b4e 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
@@ -1,55 +1,20 @@
 package org.simantics.district.network.ui.participants;
 
 import java.awt.geom.Point2D;
-import java.util.Collections;
-import java.util.List;
 import java.util.Set;
 
-import org.simantics.district.network.ui.adapters.DistrictNetworkEdgeElement;
-import org.simantics.district.network.ui.adapters.DistrictNetworkVertexElement;
+import org.simantics.g2d.canvas.ICanvasContext;
 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.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;
+import org.simantics.scenegraph.g2d.events.KeyEvent.KeyReleasedEvent;
 
 public class DNPointerInteractor extends PointerInteractor {
 
-    private static class DNPickSorter implements PickSorter {
-
-        @Override
-        public void sort(List<IElement> elements) {
-            Collections.sort(elements, (e1, e2) -> {
-                IG2DNode e1node = getNode(e1);
-                IG2DNode e2node = getNode(e2);
-                if (e1node.getZIndex() < e2node.getZIndex())
-                    return -1;
-                else if (e1node.getZIndex() > e2node.getZIndex())
-                    return 1;
-                return 0;
-            });
-        }
-
-        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;
-        }
-    }
+    private RoutingMode routingMode;
 
     public DNPointerInteractor() {
         super(new DNPickSorter());
@@ -68,10 +33,18 @@ public class DNPointerInteractor extends PointerInteractor {
 
     @EventHandler(priority = 1000)
     public boolean enterroutingMode(KeyEvent ke) {
-        if (ke.character == 't' && ke instanceof KeyReleasedEvent) {
-            getContext().add(new RoutingMode(0));
+        if (Character.toLowerCase(ke.character) == 't' && ke instanceof KeyReleasedEvent) {
+            ICanvasContext canvasContext = getContext();
+            if (routingMode == null || routingMode.isRemoved()) {
+                routingMode = new RoutingMode(0);
+                canvasContext.add(routingMode);
+            }
         }
         return false;
     }
 
+    @Override
+    public double getPickDistance() {
+        return 4;
+    }
 }