Added symbol rendering for edges.

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

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java
index 10cfa905805a52fdf22f9e3f6875fa6db66fd960..377c7f7e8d11840ff6c706b0798a52e9e61fe43f 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java
@@ -8,7 +8,6 @@ import java.awt.geom.AffineTransform;
 import java.awt.geom.Point2D;
 import java.awt.geom.Rectangle2D;
 
-import org.simantics.district.network.ModelledCRS;
 import org.simantics.district.network.ui.adapters.DistrictNetworkVertex;
 import org.simantics.scenegraph.INode;
 import org.simantics.scenegraph.ISelectionPainterNode;
@@ -46,6 +45,7 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti
     private Rectangle2D bounds;
     private transient Point2D point;
     private transient Rectangle2D rect;
+    private transient AffineTransform symbolTransform;
 
     private double nodeSize = 1;
 
@@ -86,8 +86,8 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti
         double scaleRecip = viewScaleRecip * nodeSize;
 
         // Translate lat and lon to X and Y
-        Point2D p = point = calculatePoint2D(vertex, point);
-        Rectangle2D toDraw = calculateDrawnGeometry(p, hover ? HOVERED : NORMAL, rect, scaleRecip);
+        Point2D p = point = DistrictNetworkNodeUtils.calculatePoint2D(vertex.getPoint(), point);
+        Rectangle2D toDraw = rect = DistrictNetworkNodeUtils.calculateDrawnGeometry(p, hover ? HOVERED : NORMAL, rect, scaleRecip);
 
         if (NodeUtil.isSelected(this, 1)) {
             changeColor = true;
@@ -110,23 +110,16 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti
 
         // Render SVG symbol
         for (INode nn : getNodes()) {
-            ((G2DNode)nn).setTransform(new AffineTransform(toDraw.getWidth(), 0.0, 0.0, toDraw.getHeight(), toDraw.getCenterX(), toDraw.getCenterY()));
-            ((G2DNode)nn).render(g2d);
+            G2DNode g2dNode = (G2DNode)nn;
+            symbolTransform = DistrictNetworkNodeUtils.getTransformToRectangle(toDraw, symbolTransform);
+            g2dNode.setTransform(symbolTransform);
+            g2dNode.render(g2d);
         }
         
         if (ot != null)
             g2d.setTransform(ot);
     }
 
-    private Rectangle2D calculateDrawnGeometry(Point2D p, Rectangle2D margin, Rectangle2D result, double scaleRecip) {
-        if (result == null)
-            result = new Rectangle2D.Double();
-        double mw = margin.getWidth();
-        double mh = margin.getHeight();
-        result.setFrame(p.getX() - (mw / 2 * scaleRecip), p.getY() - (mh / 2 * scaleRecip), mw * scaleRecip, mh * scaleRecip);
-        return result;
-    }
-
     @Override
     public Rectangle2D getBounds() {
         return super.getBounds();
@@ -157,22 +150,11 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti
     }
 
     private Rectangle2D calculateBounds(Rectangle2D rect) {
-        Point2D calcPoint = calculatePoint2D(vertex, point);
+        Point2D calcPoint = DistrictNetworkNodeUtils.calculatePoint2D(vertex.getPoint(), point);
         AffineTransform at = getTransform();
         return new Rectangle2D.Double(calcPoint.getX(), calcPoint.getY(), width / at.getScaleX(), height / at.getScaleY()).getBounds2D();
     }
 
-    private static Point2D calculatePoint2D(DistrictNetworkVertex vertex, Point2D result) {
-        Point2D point = vertex.getPoint();
-        double x = ModelledCRS.longitudeToX(point.getX());
-        double y = ModelledCRS.latitudeToY(-point.getY()); // Inverse because Simantics Diagram is inverted
-        if (result == null)
-            result = new Point2D.Double(x, y);
-        else
-            result.setLocation(x, y);
-        return result;
-    }
-
     public void setVertex(DistrictNetworkVertex vertex) {
         this.vertex = vertex;
         updateBounds();