X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=blobdiff_plain;ds=sidebyside;f=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fnodes%2FDistrictNetworkEdgeNode.java;fp=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fnodes%2FDistrictNetworkEdgeNode.java;h=9f8c9a23ed192245813cdccd1ddbf2a0a61ddc16;hb=00803fe68b14b5dce310a5a88b9c2a55bd1c85e6;hp=1e577e97a4553faebcfebd82659f56c4a8c96894;hpb=b654d9f368d601565303bcf646fc4fbdfbc37090;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 1e577e97..9f8c9a23 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
@@ -4,7 +4,6 @@ import java.awt.BasicStroke;
 import java.awt.Color;
 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;
@@ -21,19 +20,17 @@ public class DistrictNetworkEdgeNode extends G2DNode implements ISelectionPainte
 
     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 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 DistrictNetworkEdge edge;
     private Rectangle2D bounds;
-    private Line2D path;
+    private transient 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;
+    private transient Color dynamicColor = null;
 
     @Override
     public void init() {
@@ -54,7 +51,6 @@ public class DistrictNetworkEdgeNode extends G2DNode implements ISelectionPainte
         Color oldColor = g2d.getColor();
         BasicStroke oldStroke = (BasicStroke) g2d.getStroke();
 
-        g2d.setColor(color);
         BasicStroke bs = null;
         if (scaleStroke) {
             double scale = GeometryUtils.getScale(g2d.getTransform());
@@ -73,6 +69,7 @@ public class DistrictNetworkEdgeNode extends G2DNode implements ISelectionPainte
             g2d.draw(path);
         }
 
+        g2d.setColor(dynamicColor != null ? dynamicColor : color);
         g2d.setStroke(bs);
         g2d.draw(path);
 
@@ -153,4 +150,9 @@ public class DistrictNetworkEdgeNode extends G2DNode implements ISelectionPainte
         this.stroke = stroke;
     }
 
+    @PropertySetter(value = "dynamicColor")
+    public void setDynamicColor(Color color) {
+        this.dynamicColor = color;
+    }
+
 }