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=a1a8ae5ac5169ff2216549c3b537137f29ab17f7;hb=refs%2Fchanges%2F03%2F303%2F1;hp=e8b8337b72845aed2b75fa119b34c7483c0c9818;hpb=8034693a5c86d690649a70a62709d29c3fa197aa;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 e8b8337b..a1a8ae5a 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,22 +1,65 @@
-package org.simantics.district.network.ui.participants;
-
-import java.awt.geom.Point2D;
-import java.util.Set;
-
-import org.simantics.g2d.canvas.ICanvasParticipant;
-import org.simantics.g2d.diagram.participant.pointertool.PointerInteractor;
-import org.simantics.g2d.diagram.participant.pointertool.TerminalUtil.TerminalInfo;
-import org.simantics.g2d.element.IElement;
-
-public class DNPointerInteractor extends PointerInteractor {
-
-    @Override
-    protected ICanvasParticipant createConnectTool(TerminalInfo ti, int mouseId, Point2D startCanvasPos) {
-        return super.createConnectTool(ti, mouseId, startCanvasPos);
-    }
-    
-    @Override
-    protected ICanvasParticipant createTranslateTool(int mouseId, Point2D startCanvasPos, Point2D curCanvasPos, Set<IElement> elementsToDrag) {
-        return new DNTranslateMode(startCanvasPos, curCanvasPos, mouseId, elementsToDrag);
-    }
-}
+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.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.nodes.SingleElementNode;
+
+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;
+        }
+    }
+
+    public DNPointerInteractor() {
+        super(new DNPickSorter());
+    }
+
+    @Override
+    protected ICanvasParticipant createConnectTool(TerminalInfo ti, int mouseId, Point2D startCanvasPos) {
+        return super.createConnectTool(ti, mouseId, startCanvasPos);
+    }
+
+    @Override
+    protected ICanvasParticipant createTranslateTool(int mouseId, Point2D startCanvasPos, Point2D curCanvasPos,
+            Set<IElement> elementsToDrag) {
+        return new DNTranslateMode(startCanvasPos, curCanvasPos, mouseId, elementsToDrag);
+    }
+}