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=0d300d058bb1df991ae6cbca6726d9d4332fcfeb;hb=fa8b6523f7dc37c548f0bdd614e74b71a624c276;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..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 @@ -6,6 +6,7 @@ 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 { @@ -38,7 +39,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; } }