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%2FDistrictNetworkNodeUtils.java;h=0efab43173f112d4521667f4af00919434c3f7d2;hb=refs%2Fchanges%2F55%2F3355%2F2;hp=20479a781471ab968c0fe5b1c334c80b852a6e1f;hpb=440c2b11fd49be2feb9edd39b931306b824b8aba;p=simantics%2Fdistrict.git

diff --git a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkNodeUtils.java b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkNodeUtils.java
index 20479a78..0efab431 100644
--- a/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkNodeUtils.java
+++ b/org.simantics.district.network.ui/src/org/simantics/district/network/ui/nodes/DistrictNetworkNodeUtils.java
@@ -6,9 +6,16 @@ import java.awt.geom.Rectangle2D;
 
 import org.simantics.district.network.ModelledCRS;
 import org.simantics.maps.MapScalingTransform;
+import org.simantics.scenegraph.utils.GeometryUtils;
 
 public class DistrictNetworkNodeUtils {
 
+    public static ThreadLocal<AffineTransform> sharedTransform = new ThreadLocal<AffineTransform>() {
+        protected AffineTransform initialValue() {
+            return new AffineTransform();
+        }
+    };
+
     public static Rectangle2D calculateDrawnGeometry(Point2D p, Rectangle2D margin, Rectangle2D result, double scaleRecip) {
         if (result == null)
             result = new Rectangle2D.Double();
@@ -38,7 +45,13 @@ public class DistrictNetworkNodeUtils {
 
     public static double calculateScaleRecip(AffineTransform tr) {
         int zoomLevel = MapScalingTransform.zoomLevel(tr);
-        double t = 1.0 / Math.sqrt(zoomLevel);
-        return t;
+        return 1.0 / (getScale(tr) * Math.sqrt(zoomLevel));
+    }
+
+    static double getScale(AffineTransform tr) {
+        double scale;
+        scale = GeometryUtils.getScale(tr);
+        scale = Math.max(4096, scale); //Math.min(scale, 32768));
+        return scale;
     }
 }