Final push of district changes

[simantics/district.git] / org.simantics.district.network.ui / src / org / simantics / district / network / ui / nodes / DistrictNetworkVertexNode.java

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 8dcd5183a6cb1545ad201b681f45fefbe9d5adc6..86c71857f16a860d93498bcf534c70f0d5239f7a 100644 (file)
--- 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
@@ -27,12 +27,14 @@ public class DistrictNetworkVertexNode extends G2DNode {
     private static final double height = 1;
     
     private static final Rectangle2D NORMAL = new Rectangle2D.Double(left, top, width, height);
-    private static final Rectangle2D HOVERED = new Rectangle2D.Double(left * 2, top * 2, width * 2, height * 2);
+    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;
+
     @Override
     public void init() {
         setZIndex(2);
@@ -53,7 +55,7 @@ public class DistrictNetworkVertexNode extends G2DNode {
         Color oldColor = g2d.getColor();
         Stroke oldStroke = g2d.getStroke();
         
-        g2d.setColor(Color.RED);
+        g2d.setColor(color);
         
         double scaleRecip = 1;
         if (scaleStroke) {
@@ -85,13 +87,15 @@ public class DistrictNetworkVertexNode extends G2DNode {
 
     @Override
     public Rectangle2D getBoundsInLocal() {
+        if (hover)
+            return HOVERED;
         return NORMAL;
     }
 
     public void setVertex(DistrictNetworkVertex vertex) {
         this.vertex = vertex;
     }
-
+    
     public boolean hover(boolean hover) {
 //        if (hover && LOGGER.isDebugEnabled())
 //            LOGGER.debug("Hovering " + this);
@@ -103,4 +107,12 @@ public class DistrictNetworkVertexNode extends G2DNode {
         return changed;
     }
 
+    public void setColor(Color color) {
+        this.color = color;
+    }
+    
+    public Color getColor() {
+        return color;
+    }
+
 }