From: Tuukka Lehtonen <tuukka.lehtonen@semantum.fi>
Date: Wed, 24 Apr 2019 19:57:20 +0000 (+0000)
Subject: Merge "Open SCL script output console on demand for context menu commands."
X-Git-Url: https://gerrit.simantics.org/r/gitweb?a=commitdiff_plain;h=7f8f7bbaf706ed131efd15780d4e6ef54dd94ad2;hp=00780eaab266d26ec16d7bbb9e882a23ef1807d0;p=simantics%2Fdistrict.git

Merge "Open SCL script output console on demand for context menu commands."
---

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 c9e4a00e..0d300d05 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
@@ -39,20 +39,13 @@ public class DistrictNetworkNodeUtils {
 
     public static double calculateScaleRecip(AffineTransform tr) {
         int zoomLevel = MapScalingTransform.zoomLevel(tr);
-        double t;
-        if (zoomLevel > 15) {
-            int d = zoomLevel - 15; // stop zooming vertices when zoom level > 15
-            t = 1.0 / d / (getScale(tr) * Math.sqrt(zoomLevel));
-        } else {
-            t = 1.0 / (getScale(tr) * 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, Math.min(scale, 32768));
+        scale = Math.max(4096, scale); //Math.min(scale, 32768));
         return scale;
     }
 }