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=1e577e97a4553faebcfebd82659f56c4a8c96894;hb=29914be09d4a237840e5c793bdb562ec83093b8d;hp=408625f5aeeaa0bcafc139c636291d921860124d;hpb=16ee01dc5a40981c58fd5b478b89552e5814e8bb;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 408625f5..1e577e97 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,75 +6,115 @@ import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.Stroke;
 import java.awt.geom.AffineTransform;
+import java.awt.geom.Line2D;
+import java.awt.geom.Path2D;
 import java.awt.geom.Rectangle2D;
 
+import org.simantics.district.network.ModelledCRS;
 import org.simantics.district.network.ui.DistrictNetworkEdge;
+import org.simantics.scenegraph.ISelectionPainterNode;
 import org.simantics.scenegraph.g2d.G2DNode;
 import org.simantics.scenegraph.utils.GeometryUtils;
 import org.simantics.scenegraph.utils.NodeUtil;
 
-public class DistrictNetworkEdgeNode extends G2DNode {
+public class DistrictNetworkEdgeNode extends G2DNode implements ISelectionPainterNode {
 
     private static final long serialVersionUID = 8049769475036519806L;
-    
+
     private static final Stroke     SELECTION_STROKE = new BasicStroke(1f, BasicStroke.CAP_BUTT, BasicStroke.JOIN_MITER);
     private static final Color      SELECTION_COLOR  = new Color(255, 0, 255, 96);
-    
+
     private DistrictNetworkEdge edge;
     private Rectangle2D bounds;
-    
-    private static final Stroke STROKE = new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
+    private Line2D path;
+
+    private static final BasicStroke STROKE = new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
     private boolean scaleStroke = true;
 
+    private Color color;
+
+    private Double stroke;
+
     @Override
     public void init() {
-
     }
-    
+
     @Override
     public void render(Graphics2D g2d) {
-        
         AffineTransform ot = null;
         AffineTransform t = getTransform();
         if (t != null && !t.isIdentity()) {
             ot = g2d.getTransform();
             g2d.transform(getTransform());
         }
-        
+
         Object aaHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
 
         Color oldColor = g2d.getColor();
         BasicStroke oldStroke = (BasicStroke) g2d.getStroke();
-//        boolean selected = isSelected();
-//        if (selected) {
-//            Path2D selectionPath = edge.getPath();
-//            Shape selectionShape = SELECTION_STROKE.createStrokedShape(selectionPath);
-//            g2d.setColor(SELECTION_COLOR);
-//            g2d.fill(selectionShape);
-//        }
-//        
-        g2d.setColor(Color.BLUE);
-        if (STROKE != null) {
-            if (scaleStroke && STROKE instanceof BasicStroke) {
-                BasicStroke bs = GeometryUtils.scaleStroke(STROKE, (float) (1.0 / GeometryUtils.getScale(g2d.getTransform())));
-                g2d.setStroke(bs);
-            } else {
-                g2d.setStroke(STROKE);
-            }
+
+        g2d.setColor(color);
+        BasicStroke bs = null;
+        if (scaleStroke) {
+            double 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));
+        } else {
+            bs = STROKE;
+        }
+
+        path = calculateLine(edge, path);
+
+        if (isSelected()) {
+            g2d.setColor(SELECTION_COLOR);
+            g2d.setStroke(GeometryUtils.scaleStroke(bs, 4f));
+            g2d.draw(path);
         }
-        // render
-        g2d.draw(edge.getPath());
-        
+
+        g2d.setStroke(bs);
+        g2d.draw(path);
+
         // Reset
         g2d.setStroke(oldStroke);
         g2d.setColor(oldColor);
         g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint);
-        
+
         if (ot != null)
             g2d.setTransform(ot);
     }
 
+    public static Line2D calculateLine(DistrictNetworkEdge edge, Line2D result) {
+        // 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
+
+        if (result == null)
+            result = new Line2D.Double();
+        result.setLine(startX, startY, endX, endY);
+        return result;
+    }
+
+    public static Path2D calculatePath(DistrictNetworkEdge edge, Path2D result) {
+        // 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
+
+        if (result == null) {
+             result = new Path2D.Double();
+        } else {
+             result.reset();
+        }
+        result.moveTo(startX, startY);
+        result.lineTo(endX, endY);
+        return result;
+    }
+
     private boolean isSelected() {
         return NodeUtil.isSelected(this, 1);
     }
@@ -83,7 +123,7 @@ public class DistrictNetworkEdgeNode extends G2DNode {
     public Rectangle2D getBoundsInLocal() {
         return bounds;
     }
-    
+
     private void updateBounds() {
         Rectangle2D oldBounds = bounds;
         if (oldBounds == null)
@@ -92,7 +132,7 @@ public class DistrictNetworkEdgeNode extends G2DNode {
     }
 
     private Rectangle2D calculateBounds(Rectangle2D rect) {
-        return edge.getBounds(rect);
+        return calculatePath(edge, null).getBounds2D();
     }
 
     public void setDNEdge(DistrictNetworkEdge edge) {
@@ -100,4 +140,17 @@ public class DistrictNetworkEdgeNode extends G2DNode {
         updateBounds();
     }
 
+    public void setColor(Color color) {
+        this.color = color;
+    }
+
+    public Color getColor() {
+        return color;
+    }
+
+    @PropertySetter(value = "stroke")
+    public void setStroke(Double stroke) {
+        this.stroke = stroke;
+    }
+
 }