Some cleaning and fixing of district functionalities

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / nodes / DistrictNetworkEdgeNode.java

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 408625f5aeeaa0bcafc139c636291d921860124d..cd35b2f011329ac926fa0e6d51f8b7a0c5046fe5 100644 (file)
--- 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;
@@ -26,6 +29,8 @@ public class DistrictNetworkEdgeNode extends G2DNode {
     private static final Stroke STROKE = new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
     private boolean scaleStroke = true;
 
+    private Color color;
+
     @Override
     public void init() {
 
@@ -54,7 +59,7 @@ public class DistrictNetworkEdgeNode extends G2DNode {
 //            g2d.fill(selectionShape);
 //        }
 //        
-        g2d.setColor(Color.BLUE);
+        g2d.setColor(color);
         if (STROKE != null) {
             if (scaleStroke && STROKE instanceof BasicStroke) {
                 BasicStroke bs = GeometryUtils.scaleStroke(STROKE, (float) (1.0 / GeometryUtils.getScale(g2d.getTransform())));
@@ -63,8 +68,8 @@ public class DistrictNetworkEdgeNode extends G2DNode {
                 g2d.setStroke(STROKE);
             }
         }
-        // render
-        g2d.draw(edge.getPath());
+
+        g2d.draw(calculatePath(edge));
         
         // Reset
         g2d.setStroke(oldStroke);
@@ -74,6 +79,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());
+        double endX = ModelledCRS.longitudeToX(edge.getEndPoint().getX());
+        double endY = ModelledCRS.latitudeToY(edge.getEndPoint().getY());
+        
+        // render
+        Path2D path = new Path2D.Double();
+        path.moveTo(startX, startY);
+        path.lineTo(endX, endY);
+        return path;
+    }
 
     private boolean isSelected() {
         return NodeUtil.isSelected(this, 1);
@@ -92,7 +111,7 @@ public class DistrictNetworkEdgeNode extends G2DNode {
     }
 
     private Rectangle2D calculateBounds(Rectangle2D rect) {
-        return edge.getBounds(rect);
+        return calculatePath(edge).getBounds2D();
     }
 
     public void setDNEdge(DistrictNetworkEdge edge) {
@@ -100,4 +119,12 @@ public class DistrictNetworkEdgeNode extends G2DNode {
         updateBounds();
     }
 
+    public void setColor(Color color) {
+        this.color = color;
+    }
+    
+    public Color getColor() {
+        return color;
+    }
+
 }