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;h=030802755080b61135ddae9951c3293c663bcde4;hb=refs%2Fchanges%2F71%2F1971%2F3;hp=9170fa15eb4c495535fe9a46105cc044ace194ab;hpb=02ecca5e61d2eb17de40cc058be678b414aaad00;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 9170fa15..03080275 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
@@ -11,7 +11,6 @@ import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
 import org.simantics.district.network.ModelledCRS;
-import org.simantics.district.network.ontology.DistrictNetworkResource;
 import org.simantics.district.network.ui.DistrictNetworkEdge;
 import org.simantics.scenegraph.g2d.G2DNode;
 import org.simantics.scenegraph.utils.GeometryUtils;
@@ -32,9 +31,10 @@ public class DistrictNetworkEdgeNode extends G2DNode {
 
     private Color color;
 
+    private Double stroke;
+
     @Override
     public void init() {
-
     }
     
     @Override
@@ -63,15 +63,20 @@ 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 = 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);
         g2d.setColor(oldColor);
@@ -81,6 +86,20 @@ public class DistrictNetworkEdgeNode extends G2DNode {
             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);
     }
@@ -98,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) {
@@ -114,4 +133,9 @@ public class DistrictNetworkEdgeNode extends G2DNode {
         return color;
     }
 
+    @PropertySetter(value = "stroke")
+    public void setStroke(Double stroke) {
+        this.stroke = stroke / 100;
+    }
+
 }