NPE fix for district scene graph nodes

[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 00fe2184e49dcc53ba77fa922e426b1e4888562c..8f8c08e6cc36f7f838e86c2254217f1fff1179fa 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();
@@ -95,7 +97,7 @@ public class DistrictNetworkEdgeNode extends G2DParentNode implements ISelection
             }
 
             int zoomLevel = (Integer) g2d.getRenderingHint(DistrictRenderingHints.KEY_VIEW_ZOOM_LEVEL);
-            path = calculatePath(edge, path, zoomLevel > 15);
+            path = calculatePath(edge, path, zoomLevel > 13);
     
             if (isSelected()) {
                 g2d.setColor(SELECTION_COLOR);