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=2e2b4293871114144b53fb50e73d99065ac7c10e;hb=899b77b837b4473c0176dc9eb1b67e632b98db25;hp=0533e3117bf38b32a4f94191139fe55d8876e148;hpb=731368eea74c3292199315a38d6914b09b813632;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 0533e311..2e2b4293 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
@@ -51,6 +51,8 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti
 
     private double nodeSize = 1.0;
 
+    private boolean hidden = false;
+
     @Override
     public void init() {
         setZIndex(2);
@@ -58,9 +60,6 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti
 
     @Override
     public void render(Graphics2D g2d) {
-        if (nodeSize <= 0.0)
-            return;
-
         AffineTransform ot = null;
         AffineTransform t = getTransform();
         if (t != null && !t.isIdentity()) {
@@ -68,53 +67,59 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti
             g2d.transform(t);
         }
 
-        Object oaaHint = null;
-        Object aaHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
-        if (aaHint != RenderingHints.VALUE_ANTIALIAS_OFF) {
-            oaaHint = aaHint;
-            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
-        }
-
-        Color oldColor = g2d.getColor();
-        Color newColor = dynamicColor != null ? dynamicColor : color;
-        boolean changeColor = !oldColor.equals(newColor);
-
+        // Translate lat and lon to X and Y
+        Point2D p = point = DistrictNetworkNodeUtils.calculatePoint2D(vertex.getPoint(), point);
+        
         double viewScaleRecip = 1;
         if (scaleStroke) {
             viewScaleRecip *= DistrictNetworkNodeUtils.calculateScaleRecip(g2d.getTransform());
         }
-        double scaleRecip = viewScaleRecip * nodeSize;
-
-        // Translate lat and lon to X and Y
-        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;
-            g2d.setColor(SELECTION_COLOR);
-            BasicStroke ss = GeometryUtils.scaleStroke(STROKE, (float)viewScaleRecip);
-            g2d.setStroke(ss);
-            g2d.draw(toDraw);
-        }
-
-        // render
-        if (changeColor)
-            g2d.setColor(newColor);
-        g2d.fill(toDraw);
         
-        // Reset settings
-        if (changeColor)
-            g2d.setColor(oldColor);
-        if (oaaHint != null)
-            g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint);
+        if (!hidden && nodeSize > 0.0) {
+            Object oaaHint = null;
+            Object aaHint = g2d.getRenderingHint(RenderingHints.KEY_ANTIALIASING);
+            if (aaHint != RenderingHints.VALUE_ANTIALIAS_OFF) {
+                oaaHint = aaHint;
+                g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_OFF);
+            }
+    
+            Color oldColor = g2d.getColor();
+            Color newColor = dynamicColor != null ? dynamicColor : color;
+            boolean changeColor = !oldColor.equals(newColor);
+    
+            double scaleRecip = viewScaleRecip * nodeSize;
+    
+            Rectangle2D toDraw = rect = DistrictNetworkNodeUtils.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);
+                g2d.setStroke(ss);
+                g2d.draw(toDraw);
+            }
+    
+            // render
+            if (changeColor)
+                g2d.setColor(newColor);
+            g2d.fill(toDraw);
+            
+            // Reset settings
+            if (changeColor)
+                g2d.setColor(oldColor);
+            if (oaaHint != null)
+                g2d.setRenderingHint(RenderingHints.KEY_ANTIALIASING, aaHint);
+        }
 
         // Render SVG symbol
         for (INode nn : getNodes()) {
             G2DNode g2dNode = (G2DNode)nn;
             if (nn instanceof SVGNode) {
+                Rectangle2D toDraw = rect = DistrictNetworkNodeUtils.calculateDrawnGeometry(p, hover ? HOVERED : NORMAL, rect, viewScaleRecip);
                 symbolTransform = DistrictNetworkNodeUtils.getTransformToRectangle(toDraw, symbolTransform);
                 g2dNode.setTransform(symbolTransform);
             }
+            
             g2dNode.render(g2d);
         }
         
@@ -186,6 +191,14 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti
         
         return changed;
     }
+    
+    @Override
+    public void setMousePosition(Point2D p) {
+        for (IG2DNode child : getNodes()) {
+            if (child instanceof HoverSensitiveNode)
+                ((HoverSensitiveNode) child).setMousePosition(p);
+        }
+    }
 
     public void setColor(Color color) {
         this.color = color;
@@ -222,4 +235,8 @@ public class DistrictNetworkVertexNode extends G2DParentNode implements ISelecti
         this.dynamicColor = color;
     }
 
+    @PropertySetter(value = "hidden")
+    public void setHidden(Boolean value) {
+        this.hidden = value;
+    }
 }