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%2FDistrictNetworkVertexNode.java;h=0cd5ea884fd29058c2e12907eca01112a3e2dbe0;hb=985b0e7fb25091941011286a135731ad44809633;hp=1dd0afe5c5e52a30b773262f85207d79066a9c9b;hpb=3354c578fb8e65421d0fdb123310232ccdc597cf;p=simantics%2Fdistrict.git

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 1dd0afe5..0cd5ea88 100644
--- 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
@@ -1,5 +1,6 @@
 package org.simantics.district.network.ui.nodes;
 
+import java.awt.BasicStroke;
 import java.awt.Color;
 import java.awt.Graphics2D;
 import java.awt.RenderingHints;
@@ -9,17 +10,19 @@ import java.awt.geom.Rectangle2D;
 
 import org.simantics.district.network.ModelledCRS;
 import org.simantics.district.network.ui.adapters.DistrictNetworkVertex;
+import org.simantics.scenegraph.ISelectionPainterNode;
 import org.simantics.scenegraph.g2d.G2DNode;
 import org.simantics.scenegraph.utils.GeometryUtils;
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
+import org.simantics.scenegraph.utils.NodeUtil;
 
-public class DistrictNetworkVertexNode extends G2DNode {
+public class DistrictNetworkVertexNode extends G2DNode implements ISelectionPainterNode {
 
-    private static final Logger LOGGER = LoggerFactory.getLogger(DistrictNetworkVertexNode.class);
+    //private static final Logger LOGGER = LoggerFactory.getLogger(DistrictNetworkVertexNode.class);
 
     private static final long serialVersionUID = -2641639101400236719L;
-    private DistrictNetworkVertex vertex;
+
+    private static final BasicStroke STROKE           = new BasicStroke(4, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
+    private static final Color       SELECTION_COLOR  = new Color(255, 0, 255, 96);
 
     private static final double left = -0.25;
     private static final double top = -0.25;
@@ -29,12 +32,17 @@ public class DistrictNetworkVertexNode extends G2DNode {
     private static final Rectangle2D NORMAL = new Rectangle2D.Double(left, top, width, height);
     private static final Rectangle2D HOVERED = new Rectangle2D.Double(left * 3, top * 3, width * 3, height * 3);
 
+    private DistrictNetworkVertex vertex;
+
     private boolean scaleStroke = true;
     private boolean hover;
 
     private Color color;
+    private transient Color dynamicColor;
 
     private Rectangle2D bounds;
+    private transient Point2D point;
+    private transient Rectangle2D rect;
 
     private double nodeSize = 1;
 
@@ -63,36 +71,52 @@ public class DistrictNetworkVertexNode extends G2DNode {
         }
 
         Color oldColor = g2d.getColor();
-        g2d.setColor(color);
+        Color newColor = dynamicColor != null ? dynamicColor : color;
+        boolean changeColor = !oldColor.equals(newColor);
 
-        double scaleRecip = 1;
+        double viewScaleRecip = 1;
         if (scaleStroke) {
             double scale = GeometryUtils.getScale(g2d.getTransform());
             scale = Math.max(10000, Math.min(scale, 50000));
-            scaleRecip = 1.0 / scale;
+            viewScaleRecip = 1.0 / scale;
         }
-        scaleRecip = scaleRecip * nodeSize;
+        double scaleRecip = viewScaleRecip * nodeSize;
 
         // Translate lat and lon to X and Y
-        Point2D res = calculatePoint2D(vertex);
-
-        Rectangle2D toDraw;
-        if (hover) {
-            toDraw = new Rectangle2D.Double(res.getX() - (HOVERED.getWidth() / 2 * scaleRecip), res.getY() - (HOVERED.getHeight() / 2 * scaleRecip), HOVERED.getWidth() * scaleRecip, HOVERED.getHeight() * scaleRecip);
-        } else {
-            toDraw = new Rectangle2D.Double(res.getX() - (NORMAL.getWidth() / 2 * scaleRecip), res.getY() - (NORMAL.getHeight() / 2 * scaleRecip), NORMAL.getWidth() * scaleRecip, NORMAL.getHeight() * scaleRecip);
+        Point2D p = point = calculatePoint2D(vertex, point);
+        Rectangle2D toDraw = calculateDrawnGeometry(p, hover ? HOVERED : NORMAL, rect, scaleRecip);
+
+        if (NodeUtil.isSelected(this, 1)) {
+            changeColor = true;
+            g2d.setColor(SELECTION_COLOR);
+            BasicStroke ss = GeometryUtils.scaleStroke(STROKE, (float) viewScaleRecip*5);
+            g2d.setStroke(ss);
+            g2d.draw(toDraw);
         }
+
         // render
+        if (changeColor)
+            g2d.setColor(newColor);
         g2d.fill(toDraw);
 
         // Reset settings
-        g2d.setColor(oldColor);
+        if (changeColor)
+            g2d.setColor(oldColor);
         if (oaaHint != null)
            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint);
         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();
@@ -123,19 +147,20 @@ public class DistrictNetworkVertexNode extends G2DNode {
     }
 
     private Rectangle2D calculateBounds(Rectangle2D rect) {
-        Point2D calcPoint = calculatePoint2D(vertex);
+        Point2D calcPoint = calculatePoint2D(vertex, 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 point= vertex.getPoint();
+    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
-
-        // Apply the scaling
-        Point2D res = new Point2D.Double(x, y);
-        return res;
+        if (result == null)
+            result = new Point2D.Double(x, y);
+        else
+            result.setLocation(x, y);
+        return result;
     }
 
     public void setVertex(DistrictNetworkVertex vertex) {
@@ -176,4 +201,9 @@ public class DistrictNetworkVertexNode extends G2DNode {
             updateBounds();
     }
 
+    @PropertySetter(value = "dynamicColor")
+    public void setDynamicColor(Color color) {
+        this.dynamicColor = color;
+    }
+
 }