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=c566981e05261b5f735ae18c77538a18a97a2dc2;hb=refs%2Fchanges%2F70%2F1870%2F1;hp=a126ee5942a841f50a2108684a364a78052a4554;hpb=5747d0df198d3b3de66c51796369a7f6af314ea7;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 a126ee59..c566981e 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
@@ -6,26 +6,39 @@ 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;
+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;
+
+    private static final double left = -0.5;
+    private static final double top = -0.5;
+    private static final double width = 1;
+    private static final double height = 1;
     
-    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 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;
+
+    private Color color;
+
+    private Rectangle2D bounds;
 
     @Override
     public void init() {
@@ -47,19 +60,28 @@ public class DistrictNetworkVertexNode extends G2DNode {
         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);
-            }
+        g2d.setColor(color);
+        
+        double scaleRecip = 1;
+        if (scaleStroke) {
+            double scale = GeometryUtils.getScale(g2d.getTransform());
+            
+            //System.out.println("scale: " + scale);
+            scaleRecip = 1.0 / scale;
         }
-        // render
+        scaleRecip = 8.0 * scaleRecip;
         
-        Rectangle2D.Double rect = new Rectangle2D.Double(left / scale, top / scale, width / scale, height / scale);
-        g2d.draw(rect);
+        // 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);
+        }
+        // render
+        g2d.fill(toDraw);
         
         // Reset stats
         g2d.setColor(oldColor);
@@ -71,13 +93,73 @@ public class DistrictNetworkVertexNode extends G2DNode {
             g2d.setTransform(ot);
     }
 
+    @Override
+    public Rectangle2D getBounds() {
+        return super.getBounds();
+    }
+    
     @Override
     public Rectangle2D getBoundsInLocal() {
-        return new Rectangle2D.Double(left / scale, top / scale, width / scale, height / scale);
+        return bounds;
+    }
+    
+    private void updateBounds() {
+        Rectangle2D oldBounds = bounds;
+        if (oldBounds == null)
+            oldBounds = new Rectangle2D.Double();
+        bounds = calculateBounds(oldBounds);
+    }
+
+    @Override
+    public void setTransform(AffineTransform transform) {
+        super.setTransform(transform);
+        // 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();
+    }
+
+    private static Point2D calculatePoint2D(DistrictNetworkVertex vertex) {
+        Point2D point= vertex.getPoint();
+        double x = ModelledCRS.longitudeToX(point.getX());
+        double y = ModelledCRS.latitudeToY(point.getY());
+
+        // Apply the scaling
+        Point2D res = new Point2D.Double(x, y);
+        return res;
     }
 
     public void setVertex(DistrictNetworkVertex vertex) {
         this.vertex = vertex;
+        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;
+        }
+        return changed;
+    }
+
+    public void setColor(Color color) {
+        this.color = color;
+    }
+    
+    public Color getColor() {
+        return color;
     }
 
 }