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;fp=org.simantics.district.network.ui%2Fsrc%2Forg%2Fsimantics%2Fdistrict%2Fnetwork%2Fui%2Fnodes%2FDistrictNetworkVertexNode.java;h=a126ee5942a841f50a2108684a364a78052a4554;hb=5747d0df198d3b3de66c51796369a7f6af314ea7;hp=7365060b0254bc8c6f62d5c4cb4aeef8e1dcd6d5;hpb=8034693a5c86d690649a70a62709d29c3fa197aa;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 7365060b..a126ee59 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,54 +1,83 @@
-package org.simantics.district.network.ui.nodes;
-
-import java.awt.Color;
-import java.awt.Graphics2D;
-import java.awt.RenderingHints;
-import java.awt.geom.AffineTransform;
-import java.awt.geom.Rectangle2D;
-
-import org.simantics.district.network.ui.adapters.DistrictNetworkVertex;
-import org.simantics.scenegraph.g2d.G2DNode;
-
-public class DistrictNetworkVertexNode extends G2DNode {
-
-    private static final long serialVersionUID = -2641639101400236719L;
-    private DistrictNetworkVertex vertex;
-
-    @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_OFF);
-        
-        Color oldColor = g2d.getColor();
-        g2d.setColor(Color.RED);
-        // render
-        
-        Rectangle2D.Double rect = new Rectangle2D.Double(-0.5, -0.5, 1, 1);
-        g2d.draw(rect);
-        
-        // Reset stats
-        g2d.setColor(oldColor);
-        
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint);
-        
-        if (ot != null)
-            g2d.setTransform(ot);
-    }
-
-    @Override
-    public Rectangle2D getBoundsInLocal() {
-        return new Rectangle2D.Double(-0.5, -0.5, 1, 1);
-    }
-
-    public void setVertex(DistrictNetworkVertex vertex) {
-        this.vertex = vertex;
-    }
-
-}
+package org.simantics.district.network.ui.nodes;
+
+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.Rectangle2D;
+
+import org.simantics.district.network.ui.adapters.DistrictNetworkVertex;
+import org.simantics.scenegraph.g2d.G2DNode;
+import org.simantics.scenegraph.utils.GeometryUtils;
+
+public class DistrictNetworkVertexNode extends G2DNode {
+
+    private static final long serialVersionUID = -2641639101400236719L;
+    private DistrictNetworkVertex vertex;
+    
+    private static final double scale = 1;
+    
+    private double left = -0.5;
+    private double top = -0.5;
+    private double width = 1;
+    private double height = 1;
+    
+    private Stroke stroke = new BasicStroke(2);
+    private boolean scaleStroke = true;
+
+    @Override
+    public void init() {
+        setZIndex(2);
+    }
+    
+    @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_OFF);
+        
+        Color oldColor = g2d.getColor();
+        Stroke oldStroke = g2d.getStroke();
+        
+        g2d.setColor(Color.RED);
+        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);
+            }
+        }
+        // render
+        
+        Rectangle2D.Double rect = new Rectangle2D.Double(left / scale, top / scale, width / scale, height / scale);
+        g2d.draw(rect);
+        
+        // Reset stats
+        g2d.setColor(oldColor);
+        g2d.setStroke(oldStroke);
+        
+        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint);
+        
+        if (ot != null)
+            g2d.setTransform(ot);
+    }
+
+    @Override
+    public Rectangle2D getBoundsInLocal() {
+        return new Rectangle2D.Double(left / scale, top / scale, width / scale, height / scale);
+    }
+
+    public void setVertex(DistrictNetworkVertex vertex) {
+        this.vertex = vertex;
+    }
+
+}