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;fp=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fadapters%2FDistrictNetworkEdgeElement.java;h=ef2e21fed709518ca5c7c21075018526f0474dc6;hb=731368eea74c3292199315a38d6914b09b813632;hp=34424739eb9a0764dbab3d7338a183b86994ff29;hpb=e1559239456cfd3d9ad925cd3bbd4b04a41e71d6;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 34424739..ef2e21fe 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
@@ -4,6 +4,8 @@ import java.awt.Color;
 import java.awt.Shape;
 import java.awt.geom.AffineTransform;
 import java.awt.geom.Line2D;
+import java.awt.geom.Path2D;
+import java.awt.geom.PathIterator;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 import java.util.Collection;
@@ -29,6 +31,7 @@ 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.scenegraph.utils.NodeUtil;
 import org.simantics.utils.datastructures.hints.IHintContext.Key;
 import org.simantics.utils.datastructures.hints.IHintContext.KeyOf;
 import org.slf4j.Logger;
@@ -129,7 +132,7 @@ public class DistrictNetworkEdgeElement {
                 Rectangle2D bounds = getBounds(s);
                 switch (policy) {
                 case PICK_CONTAINED_OBJECTS:    return pickContainedObjects(edge, bounds);
-                case PICK_INTERSECTING_OBJECTS: return pickIntersectingObjects(edge, bounds);
+                case PICK_INTERSECTING_OBJECTS: return pickIntersectingObjects(e, edge, bounds);
                 }
                 return false;
             }
@@ -162,21 +165,54 @@ public class DistrictNetworkEdgeElement {
             return eminx >= bsminx && eminy >= boundsMinY && emaxx <= bsmaxx && emaxy <= boundsMaxY;
         }
 
-        private boolean pickIntersectingObjects(DistrictNetworkEdge edge, Rectangle2D bounds) {
-            double tolerance = (bounds.getHeight() + bounds.getHeight()) * 1 / MapScalingTransform.getScaleX();
-            Line2D line = new Line2D.Double(edge.getStartPoint(), edge.getEndPoint());
+        private boolean pickIntersectingObjects(IElement e, DistrictNetworkEdge edge, Rectangle2D bounds) {
+            double dx = bounds.getWidth() / MapScalingTransform.getScaleX();
+            double dy = bounds.getHeight() / MapScalingTransform.getScaleY();
+            
+            // Half the diagonal + half of the line width
+            DistrictNetworkEdgeNode node = e.getHint(KEY_DN_EDGE_NODE);
+            AffineTransform at = NodeUtil.getLocalToGlobalTransform(node);
+            
+            Path2D path = node.getPath();
+            if (path == null)
+                return false;
+            
+            double lineWidth = node.getStrokeWidth(at, true);
+            double tolerance = Math.sqrt(dx * dx + dy * dy) / 2 + lineWidth / 2;
+            
             double sx = bounds.getCenterX() / MapScalingTransform.getScaleX();
             double sy = bounds.getCenterY() / MapScalingTransform.getScaleY();
-            double ssx = ModelledCRS.xToLongitude(sx);
-            double ssy = ModelledCRS.yToLatitude(-sy); // Invert for Simantics diagram coordinate system
-            double distSq = line.ptSegDistSq(ssx, ssy);
-//            System.out.println("s: " + sx + ", " + sy);
-//            System.out.println("ss: " + ssx + ", " + ssy);
-//            System.out.println("p1: " + edge.getStartPoint());
-//            System.out.println("p2: " + edge.getEndPoint());
-//            System.out.println("line: " + "(" + line.getX1() + ", " + line.getY1() + ", " + line.getX2() + ", " + line.getY2() + ")");
-//            System.out.println("distance from line is " + Math.sqrt(distSq) + " with tolerance " + tolerance);
-            return distSq <= tolerance * tolerance;
+            
+            double coords[] = new double[6];
+            Point2D prevPoint = new Point2D.Double(), curPoint = new Point2D.Double();
+            Line2D line = new Line2D.Double();
+            for (PathIterator it = path.getPathIterator(null); !it.isDone(); it.next()) {
+                int type = it.currentSegment(coords);
+                switch (type) {
+                case PathIterator.SEG_MOVETO:
+                    curPoint.setLocation(coords[0], coords[1]);
+                    break;
+                case PathIterator.SEG_LINETO:
+                    prevPoint.setLocation(curPoint);
+                    curPoint.setLocation(coords[0], coords[1]);
+                    line.setLine(prevPoint, curPoint);
+                    double distSq = line.ptSegDistSq(sx, sy);
+//                    System.out.println("s: " + sx + ", " + sy);
+//                    System.out.println("ss: " + ssx + ", " + ssy);
+//                    System.out.println("p1: " + edge.getStartPoint());
+//                    System.out.println("p2: " + edge.getEndPoint());
+//                    System.out.println("line: " + "(" + line.getX1() + ", " + line.getY1() + ", " + line.getX2() + ", " + line.getY2() + ")");
+//                    System.out.println("distance from line is " + Math.sqrt(distSq) + " with tolerance " + tolerance);
+                    if (distSq <= tolerance * tolerance)
+                        return true; 
+                    break;
+                default:
+                    LOGGER.error("Invalid edge path", new IllegalStateException());
+                    return false;
+                }
+            }
+            
+            return false;
         }
 
         private Rectangle2D getBounds(Shape shape) {