Fixed two selection/picking related bugs

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

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
index 8c4af387cee34a288e888e0c03d74c943198424b..e112c536622a3ffdce0a4ad4af64271d865e4bd9 100644 (file)
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkEdgeNode.java
@@ -71,6 +71,8 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
         if (t != null && !t.isIdentity()) {
             //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();
@@ -261,7 +263,7 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
     }
 
     private Rectangle2D calculateBounds(Rectangle2D rect) {
-        return calculatePath(edge, null, false).getBounds2D();
+        return calculatePath(edge, null, true).getBounds2D();
     }
 
     public void setDNEdge(DistrictNetworkEdge edge) {