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=1dd0afe5c5e52a30b773262f85207d79066a9c9b;hb=29914be09d4a237840e5c793bdb562ec83093b8d;hp=99eb3cc117b7fb91cbb8352016a62da7e9836249;hpb=10fe42db158693adffc526131d37f58cbd5780b2;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 99eb3cc1..1dd0afe5 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,17 +1,14 @@
 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.Point2D;
 import java.awt.geom.Rectangle2D;
 
 import org.simantics.district.network.ModelledCRS;
 import org.simantics.district.network.ui.adapters.DistrictNetworkVertex;
-import org.simantics.scenegraph.ParentNode;
 import org.simantics.scenegraph.g2d.G2DNode;
 import org.simantics.scenegraph.utils.GeometryUtils;
 import org.slf4j.Logger;
@@ -20,7 +17,7 @@ import org.slf4j.LoggerFactory;
 public class DistrictNetworkVertexNode extends G2DNode {
 
     private static final Logger LOGGER = LoggerFactory.getLogger(DistrictNetworkVertexNode.class);
-    
+
     private static final long serialVersionUID = -2641639101400236719L;
     private DistrictNetworkVertex vertex;
 
@@ -28,11 +25,10 @@ public class DistrictNetworkVertexNode extends G2DNode {
     private static final double top = -0.25;
     private static final double width = 0.5;
     private static final double height = 0.5;
-    
+
     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 Stroke stroke = new BasicStroke(2);
+
     private boolean scaleStroke = true;
     private boolean hover;
 
@@ -40,46 +36,46 @@ public class DistrictNetworkVertexNode extends G2DNode {
 
     private Rectangle2D bounds;
 
-    private Double strokee;
+    private double nodeSize = 1;
 
     @Override
     public void init() {
         setZIndex(2);
     }
-    
+
     @Override
     public void render(Graphics2D g2d) {
+        if (nodeSize <= 0.0)
+            return;
+
         AffineTransform ot = null;
         AffineTransform t = getTransform();
         if (t != null && !t.isIdentity()) {
             ot = g2d.getTransform();
             g2d.transform(getTransform());
         }
-        
+
+        Object oaaHint = null;
         Object aaHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
-        
+        if (aaHint != RenderingHints.VALUE_ANTIALIAS_OFF) {
+            oaaHint = aaHint;
+            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+        }
+
         Color oldColor = g2d.getColor();
-        Stroke oldStroke = g2d.getStroke();
-        
         g2d.setColor(color);
-        
+
         double scaleRecip = 1;
         if (scaleStroke) {
             double scale = GeometryUtils.getScale(g2d.getTransform());
-            double str;
-            if (strokee != null)
-                str = strokee;
-            else
-                str = 1.0;
-            //System.out.println("scale: " + scale);
+            scale = Math.max(10000, Math.min(scale, 50000));
             scaleRecip = 1.0 / scale;
         }
-        scaleRecip = 8.0 * scaleRecip;
-        
+        scaleRecip = scaleRecip * 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);
@@ -88,13 +84,11 @@ public class DistrictNetworkVertexNode extends G2DNode {
         }
         // render
         g2d.fill(toDraw);
-        
-        // Reset stats
+
+        // Reset settings
         g2d.setColor(oldColor);
-        g2d.setStroke(oldStroke);
-        
-        g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint);
-        
+        if (oaaHint != null)
+           g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint);
         if (ot != null)
             g2d.setTransform(ot);
     }
@@ -103,12 +97,12 @@ public class DistrictNetworkVertexNode extends G2DNode {
     public Rectangle2D getBounds() {
         return super.getBounds();
     }
-    
+
     @Override
     public Rectangle2D getBoundsInLocal() {
         return bounds;
     }
-    
+
     private void updateBounds() {
         Rectangle2D oldBounds = bounds;
         if (oldBounds == null)
@@ -122,16 +116,16 @@ public class DistrictNetworkVertexNode extends G2DNode {
         // Update bounds
         updateBounds();
     }
-    
+
     @Override
     public AffineTransform getTransform() {
         return super.getTransform();
     }
-    
+
     private Rectangle2D calculateBounds(Rectangle2D rect) {
         Point2D calcPoint = calculatePoint2D(vertex);
         AffineTransform at = getTransform();
-        return new Rectangle2D.Double(calcPoint.getX(), calcPoint.getY(), 1 / at.getScaleX(), 1 / at.getScaleY()).getBounds2D();
+        return new Rectangle2D.Double(calcPoint.getX(), calcPoint.getY(), width / at.getScaleX(), height / at.getScaleY()).getBounds2D();
     }
 
     private static Point2D calculatePoint2D(DistrictNetworkVertex vertex) {
@@ -148,7 +142,7 @@ public class DistrictNetworkVertexNode extends G2DNode {
         this.vertex = vertex;
         updateBounds();
     }
-    
+
     public boolean hover(boolean hover) {
 //        if (hover && LOGGER.isDebugEnabled())
 //            LOGGER.debug("Hovering " + this);
@@ -163,13 +157,23 @@ public class DistrictNetworkVertexNode extends G2DNode {
     public void setColor(Color color) {
         this.color = color;
     }
-    
+
     public Color getColor() {
         return color;
     }
 
-    @PropertySetter(value = "stroke")
-    public void setStroke(Double stroke) {
-        this.strokee = stroke / 10;
+    @PropertySetter(value = "size")
+    public void setSize(Double size) {
+        boolean changed = false;
+        if (size != null) {
+            changed = size != this.nodeSize;
+            this.nodeSize = size;
+        } else {
+            changed = this.nodeSize != 1.0;
+            this.nodeSize = 1.0;
+        }
+        if (changed)
+            updateBounds();
     }
+
 }