]> gerrit.simantics Code Review - simantics/district.git/blobdiff - org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkVertexNode.java
NPE fix for district scene graph nodes
[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / nodes / DistrictNetworkVertexNode.java
index 1dd0afe5c5e52a30b773262f85207d79066a9c9b..1639d5712b8abaaf3fc8e542d74d9d9110444a4b 100644 (file)
@@ -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;
@@ -7,36 +8,51 @@ 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.maps.MapScalingTransform;
+import org.simantics.scenegraph.INode;
+import org.simantics.scenegraph.ISelectionPainterNode;
 import org.simantics.scenegraph.g2d.G2DNode;
+import org.simantics.scenegraph.g2d.G2DParentNode;
+import org.simantics.scenegraph.g2d.G2DRenderingHints;
+import org.simantics.scenegraph.g2d.IG2DNode;
+import org.simantics.scenegraph.g2d.nodes.SVGNode;
 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 G2DParentNode implements ISelectionPainterNode, HoverSensitiveNode {
 
-    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 double left = -0.25;
-    private static final double top = -0.25;
-    private static final double width = 0.5;
-    private static final double height = 0.5;
+    private static final double left = -15;
+    private static final double top = left;
+    public static final double width = 30;
+    private static final double height = width;
+
+    private static final BasicStroke STROKE           = new BasicStroke((float)width, BasicStroke.CAP_ROUND, BasicStroke.JOIN_ROUND);
+    private static final Color       SELECTION_COLOR  = new Color(255, 0, 255, 96);
 
     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 static final Rectangle2D HOVERED = new Rectangle2D.Double(left * 2, top * 2, width * 2, height * 2);
+
+    private DistrictNetworkVertex vertex;
 
-    private boolean scaleStroke = true;
+    private static 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 transient AffineTransform symbolTransform;
 
-    private double nodeSize = 1;
+    private double nodeSize = 1.0;
+
+    private boolean hidden = false;
 
     @Override
     public void init() {
@@ -45,50 +61,75 @@ public class DistrictNetworkVertexNode extends G2DNode {
 
     @Override
     public void render(Graphics2D g2d) {
-        if (nodeSize <= 0.0)
-            return;
-
         AffineTransform ot = null;
         AffineTransform t = getTransform();
+        double viewScaleRecip = scaleStroke ? (Double) g2d.getRenderingHint(DistrictRenderingHints.KEY_VIEW_SCALE_RECIPROCAL_UNDER_SPATIAL_ROOT) : 1.0;
         if (t != null && !t.isIdentity()) {
-            ot = g2d.getTransform();
-            g2d.transform(getTransform());
-        }
-
-        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);
+            //ot = g2d.getTransform();
+            ot = (AffineTransform) g2d.getRenderingHint(G2DRenderingHints.KEY_TRANSFORM_UNDER_SPATIAL_ROOT);
+            if (ot == null)
+                ot = g2d.getTransform();
+            g2d.transform(t);
+
+            if (scaleStroke) {
+                AffineTransform work = DistrictNetworkNodeUtils.sharedTransform.get();
+                work.setTransform(ot);
+                work.concatenate(t);
+                viewScaleRecip = DistrictNetworkNodeUtils.calculateScaleRecip(work);
+            }
         }
 
-        Color oldColor = g2d.getColor();
-        g2d.setColor(color);
-
-        double scaleRecip = 1;
-        if (scaleStroke) {
-            double scale = GeometryUtils.getScale(g2d.getTransform());
-            scale = Math.max(10000, Math.min(scale, 50000));
-            scaleRecip = 1.0 / scale;
-        }
-        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);
-        } 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 = DistrictNetworkNodeUtils.calculatePoint2D(vertex.getPoint(), point);
+
+        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
-        g2d.fill(toDraw);
 
-        // Reset settings
-        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);
+        }
+        
         if (ot != null)
             g2d.setTransform(ot);
     }
@@ -100,6 +141,7 @@ public class DistrictNetworkVertexNode extends G2DNode {
 
     @Override
     public Rectangle2D getBoundsInLocal() {
+        updateBounds();
         return bounds;
     }
 
@@ -117,25 +159,19 @@ public class DistrictNetworkVertexNode extends G2DNode {
         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(), width / at.getScaleX(), height / at.getScaleY()).getBounds2D();
-    }
-
-    private static Point2D calculatePoint2D(DistrictNetworkVertex vertex) {
-        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;
+        Point2D calcPoint = DistrictNetworkNodeUtils.calculatePoint2D(vertex.getPoint(), point);
+        AffineTransform at = NodeUtil.getLocalToGlobalTransform(this);
+        at.concatenate(MapScalingTransform.INSTANCE);
+        double x = calcPoint.getX();
+        double y = calcPoint.getY();
+        double scaleRecip = DistrictNetworkNodeUtils.calculateScaleRecip(at);
+        double widthh = width * scaleRecip * nodeSize;
+        double heighth = height * scaleRecip * nodeSize;
+        if (rect == null)
+            rect = new Rectangle2D.Double();
+        rect.setRect(x - widthh/2, y - heighth/2, widthh, heighth);
+        return rect;
     }
 
     public void setVertex(DistrictNetworkVertex vertex) {
@@ -143,16 +179,28 @@ public class DistrictNetworkVertexNode extends G2DNode {
         updateBounds();
     }
 
-    public boolean hover(boolean hover) {
-//        if (hover && LOGGER.isDebugEnabled())
-//            LOGGER.debug("Hovering " + this);
-        boolean changed = false;
-        if (this.hover != hover) {
-            this.hover = hover;
-            changed = true;
+    @Override
+    public boolean hover(boolean hover, boolean isConnectionTool) {
+        // Only react to hover when the connection tool is active
+        boolean doHover = hover && isConnectionTool;
+        boolean changed = this.hover != doHover;
+        this.hover = doHover;
+        
+        for (IG2DNode child : getNodes()) {
+            if (child instanceof HoverSensitiveNode)
+                changed = ((HoverSensitiveNode)child).hover(hover, isConnectionTool) || changed;
         }
+        
         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;
@@ -162,6 +210,14 @@ public class DistrictNetworkVertexNode extends G2DNode {
         return color;
     }
 
+    @PropertySetter(value = "SVG")
+    public void setSVG(String value) {
+        for (INode nn : this.getNodes())
+            if (nn instanceof SVGNode)
+                ((SVGNode)nn).setData(value);
+    }
+    
+    
     @PropertySetter(value = "size")
     public void setSize(Double size) {
         boolean changed = false;
@@ -176,4 +232,13 @@ public class DistrictNetworkVertexNode extends G2DNode {
             updateBounds();
     }
 
+    @PropertySetter(value = "dynamicColor")
+    public void setDynamicColor(Color color) {
+        this.dynamicColor = color;
+    }
+
+    @PropertySetter(value = "hidden")
+    public void setHidden(Boolean value) {
+        this.hidden = value;
+    }
 }