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=a4f348eb11e1314b0b07119a7adf235861b453dc;hb=830edf8e15f1608c13a869efe52d61f7da6bd9ae;hp=00a1427f5f2e6d07f72c6770364f94892afb64c1;hpb=8364294edf86a6915ae3fe7eade555d95fd7e435;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 00a1427f..a4f348eb 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
@@ -5,13 +5,14 @@ import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
 import java.awt.geom.AffineTransform;
-import java.awt.geom.Line2D;
 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.district.network.ui.adapters.DistrictNetworkEdgeElementFactory;
+import org.simantics.maps.MapScalingTransform;
 import org.simantics.scenegraph.INode;
 import org.simantics.scenegraph.ISelectionPainterNode;
 import org.simantics.scenegraph.g2d.G2DNode;
@@ -29,7 +30,7 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
 
     private DistrictNetworkEdge edge;
     private Rectangle2D bounds;
-    private transient Line2D path;
+    private transient Path2D path;
 
     private boolean scaleStroke = true;
     private Color color;
@@ -76,8 +77,8 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
         } else {
             bs = STROKE;
         }
-
-        path = calculateLine(edge, path);
+        int zoomLevel = MapScalingTransform.zoomLevel(ot);
+        path = calculatePath(edge, path, zoomLevel > 15);
 
         if (isSelected()) {
             g2d.setColor(SELECTION_COLOR);
@@ -126,20 +127,20 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
         return centerPoint;
     }
 
-    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) {
+//    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, boolean detailed) {
         // Convert to screen coordinates
         double startX = ModelledCRS.longitudeToX(edge.getStartPoint().getX());
         double startY = ModelledCRS.latitudeToY(-edge.getStartPoint().getY()); // Invert for Simantics
@@ -152,6 +153,18 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
              result.reset();
         }
         result.moveTo(startX, startY);
+        if (detailed) {
+            double[] detailedGeometry = edge.getGeometry();
+            if (detailedGeometry != null && !DistrictNetworkEdgeElementFactory.EMPTY.equals(detailedGeometry)) {
+                // ok, lets do this
+                
+                for (int i = 0; i < detailedGeometry.length; i += 2) {
+                    double x = ModelledCRS.longitudeToX(detailedGeometry[i]);
+                    double y = ModelledCRS.latitudeToY(-detailedGeometry[i+1]);// Invert for Simantics
+                    result.lineTo(x, y);
+                }
+            }
+        }
         result.lineTo(endX, endY);
         return result;
     }
@@ -173,7 +186,7 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
     }
 
     private Rectangle2D calculateBounds(Rectangle2D rect) {
-        return calculatePath(edge, null).getBounds2D();
+        return calculatePath(edge, null, false).getBounds2D();
     }
 
     public void setDNEdge(DistrictNetworkEdge edge) {