X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fnodes%2FDistrictNetworkEdgeNode.java;h=a088ca903810f7211c3b8d64d193b378b4a8f362;hb=9f18f45e7d0b3bc1ca80a15a9d4c8fe8354f49ec;hp=11d883e91d560c77a4ceb2297ff4d51988aa657e;hpb=1bc60c2213f9b3fc7b4d935ba9afda2b767290e5;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 11d883e9..a088ca90 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
@@ -6,8 +6,11 @@ import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.Stroke;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Path2D;
+import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
+import org.simantics.district.network.ModelledCRS;
 import org.simantics.district.network.ui.DistrictNetworkEdge;
 import org.simantics.scenegraph.g2d.G2DNode;
 import org.simantics.scenegraph.utils.GeometryUtils;
@@ -28,9 +31,10 @@ public class DistrictNetworkEdgeNode extends G2DNode {
 
     private Color color;
 
+    private Double stroke;
+
     @Override
     public void init() {
-
     }
     
     @Override
@@ -59,14 +63,19 @@ public class DistrictNetworkEdgeNode extends G2DNode {
         g2d.setColor(color);
         if (STROKE != null) {
             if (scaleStroke && STROKE instanceof BasicStroke) {
-                BasicStroke bs = GeometryUtils.scaleStroke(STROKE, (float) (1.0 / GeometryUtils.getScale(g2d.getTransform())));
+                double str;
+                if (stroke != null)
+                    str = Math.abs(stroke);
+                else
+                    str = 1.0;
+                BasicStroke bs = GeometryUtils.scaleStroke(STROKE, (float) (str / GeometryUtils.getScale(g2d.getTransform())));
                 g2d.setStroke(bs);
             } else {
                 g2d.setStroke(STROKE);
             }
         }
-        // render
-        g2d.draw(edge.getPath());
+
+        g2d.draw(calculatePath(edge));
         
         // Reset
         g2d.setStroke(oldStroke);
@@ -76,6 +85,20 @@ public class DistrictNetworkEdgeNode extends G2DNode {
         if (ot != null)
             g2d.setTransform(ot);
     }
+    
+    public static Path2D calculatePath(DistrictNetworkEdge edge) {
+        // Convert to screen coordinates
+        double startX = ModelledCRS.longitudeToX(edge.getStartPoint().getX());
+        double startY = ModelledCRS.latitudeToY(-edge.getStartPoint().getY()); // Invert for Simantics
+        double endX = ModelledCRS.longitudeToX(edge.getEndPoint().getX());
+        double endY = ModelledCRS.latitudeToY(-edge.getEndPoint().getY());// Invert for Simantics
+        
+        // render
+        Path2D path = new Path2D.Double();
+        path.moveTo(startX, startY);
+        path.lineTo(endX, endY);
+        return path;
+    }
 
     private boolean isSelected() {
         return NodeUtil.isSelected(this, 1);
@@ -94,7 +117,7 @@ public class DistrictNetworkEdgeNode extends G2DNode {
     }
 
     private Rectangle2D calculateBounds(Rectangle2D rect) {
-        return edge.getBounds(rect);
+        return calculatePath(edge).getBounds2D();
     }
 
     public void setDNEdge(DistrictNetworkEdge edge) {
@@ -110,4 +133,9 @@ public class DistrictNetworkEdgeNode extends G2DNode {
         return color;
     }
 
+    @PropertySetter(value = "stroke")
+    public void setStroke(Double stroke) {
+        this.stroke = stroke / 100;
+    }
+
 }