X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fadapters%2FDistrictNetworkEdgeElement.java;h=ce57e0a21fd7f12b0f8968b74af4899a1092cbaf;hb=refs%2Fchanges%2F52%2F2752%2F2;hp=9595f232debb6339459ff11203b5e2f56139bed4;hpb=04d29917ceb4e34d2d9fc32ac4c7c8bdd2f4a732;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java
index 9595f232..ce57e0a2 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/adapters/DistrictNetworkEdgeElement.java
@@ -28,6 +28,7 @@ import org.simantics.g2d.element.handler.impl.DefaultTransform;
 import org.simantics.g2d.element.handler.impl.SimpleElementLayers;
 import org.simantics.maps.MapScalingTransform;
 import org.simantics.scenegraph.g2d.G2DParentNode;
+import org.simantics.scenegraph.g2d.nodes.SVGNode;
 import org.simantics.utils.datastructures.hints.IHintContext.Key;
 import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
 import org.slf4j.Logger;
@@ -37,6 +38,7 @@ public class DistrictNetworkEdgeElement {
 
     public static final Key KEY_DN_EDGE = new KeyOf(DistrictNetworkEdge.class, "DN_EDGE");
     public static final Key KEY_DN_EDGE_NODE = new SceneGraphNodeKey(DistrictNetworkEdgeNode.class, "DN_EDGE_NODE");
+    public static final Key KEY_DN_EDGE_SYMBOL_NODE = new SceneGraphNodeKey(DistrictNetworkEdgeNode.class, "DN_EDGE_SYMBOL_NODE");
 
     public static final ElementClass CLASS =
             ElementClass.compile(
@@ -66,6 +68,9 @@ public class DistrictNetworkEdgeElement {
                 if (node == null) {
                     node = parent.addNode(ElementUtils.generateNodeId(edgeElement), DistrictNetworkEdgeNode.class);
                     edgeElement.setHint(KEY_DN_EDGE_NODE, node);
+                    
+                    SVGNode symbol = node.addNode(ElementUtils.generateNodeId(edgeElement), SVGNode.class);
+                    edgeElement.setHint(KEY_DN_EDGE_SYMBOL_NODE, symbol);
                 }
                 
                 node.setColor(ElementUtils.getAdditionalColor(edgeElement, Color.BLUE));
@@ -79,8 +84,10 @@ public class DistrictNetworkEdgeElement {
 
         @Override
         public void cleanup(IElement edge) {
+            ElementUtils.removePossibleNode(edge, KEY_DN_EDGE_SYMBOL_NODE);
             ElementUtils.removePossibleNode(edge, KEY_DN_EDGE_NODE);
             edge.removeHint(KEY_DN_EDGE_NODE);
+            edge.removeHint(KEY_DN_EDGE_SYMBOL_NODE);
         }
     }
 
@@ -156,7 +163,7 @@ public class DistrictNetworkEdgeElement {
         }
 
         private boolean pickIntersectingObjects(DistrictNetworkEdge edge, Rectangle2D bounds) {
-            double tolerance = (bounds.getHeight() + bounds.getHeight()) * 0.25 / MapScalingTransform.getScaleX();
+            double tolerance = (bounds.getHeight() + bounds.getHeight()) * 1 / MapScalingTransform.getScaleX();
             Line2D line = new Line2D.Double(edge.getStartPoint(), edge.getEndPoint());
             double sx = bounds.getCenterX() / MapScalingTransform.getScaleX();
             double sy = bounds.getCenterY() / MapScalingTransform.getScaleY();