X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fnodes%2FDistrictNetworkEdgeNode.java;fp=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fnodes%2FDistrictNetworkEdgeNode.java;h=61aec5ce55cc8285ad64b8b8fafc67984bc3c463;hb=731368eea74c3292199315a38d6914b09b813632;hp=74e8acdc575fa79a833ab38e92e56d2fda0324e2;hpb=e1559239456cfd3d9ad925cd3bbd4b04a41e71d6;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
index 74e8acdc..61aec5ce 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
@@ -79,10 +79,9 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
         BasicStroke bs = null;
         double scale = 1.0;
         if (scaleStroke) {
-            scale = GeometryUtils.getScale(g2d.getTransform());
-            scale = Math.max(10000, Math.min(scale, 50000));
-            double str = stroke != null ? Math.abs(stroke) : 1.0;
-            bs = GeometryUtils.scaleStroke(STROKE, (float) (str / scale));
+            AffineTransform tr = g2d.getTransform();
+            scale = DistrictNetworkNodeUtils.getScale(tr);
+            bs = GeometryUtils.scaleStroke(STROKE, getStrokeWidth(scale));
         } else {
             bs = STROKE;
         }
@@ -91,7 +90,7 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
 
         if (isSelected()) {
             g2d.setColor(SELECTION_COLOR);
-            g2d.setStroke(GeometryUtils.scaleStroke(bs, 4f));
+            g2d.setStroke(GeometryUtils.scaleAndOffsetStrokeWidth(bs, 1.f, (float)(2 * STROKE.getLineWidth() / scale)));
             g2d.draw(path);
         }
 
@@ -157,6 +156,28 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
             g2d.setTransform(ot);
     }
 
+    public float getStrokeWidth(AffineTransform tr, boolean selection) {
+        double scale = DistrictNetworkNodeUtils.getScale(tr);
+        float width = STROKE.getLineWidth() * getStrokeWidth(scale);
+        if (selection) width = width + (float) (2 * STROKE.getLineWidth() / scale);
+        return width;
+    }
+    
+    private float getStrokeWidth(double scale) {
+        if (scaleStroke) {
+            double str = stroke != null ? Math.abs(stroke) : 1.0;
+            float strokeWidth = (float) (str / scale);
+            return strokeWidth;
+        }
+        else {
+            return 1.f;
+        }
+    }
+
+    public Path2D getPath() {
+        return path;
+    }
+    
     private Point2D getCenterPoint() {
         if (centerPoint == null)
             centerPoint = new Point2D.Double();