Merge remote-tracking branch 'origin/master' into release/1.35.2

[simantics/district.git] / org.simantics.district.maps / src / org / simantics / maps / sg / MapScaleNode.java

diff --git a/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java b/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java
index dc6b393d5a4ea2e8daf334d1095e3f7b46f0cb98..e506e11d4a14ab71e2f4dacb7ed5c8797d4f502f 100644 (file)
--- a/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java
+++ b/org.simantics.district.maps/src/org/simantics/maps/sg/MapScaleNode.java
@@ -16,6 +16,7 @@ import org.geotools.referencing.GeodeticCalculator;
 import org.opengis.referencing.FactoryException;
 import org.opengis.referencing.crs.CoordinateReferenceSystem;
 import org.simantics.scenegraph.g2d.G2DNode;
+import org.simantics.scenegraph.utils.DPIUtil;
 import org.simantics.scenegraph.utils.GridUtils;
 
 public class MapScaleNode extends G2DNode {
@@ -47,7 +48,7 @@ public class MapScaleNode extends G2DNode {
         double offsetY = tr.getTranslateY();
         g.setTransform(new AffineTransform());
 
-        Font rulerFont = new Font("Tahoma", Font.PLAIN, 9);
+        Font rulerFont = new Font("Tahoma", Font.PLAIN, DPIUtil.upscale(9));;
 
         //g.setRenderingHint(RenderingHints.KEY_ANTIALIASING, RenderingHints.VALUE_ANTIALIAS_ON);
         g.setStroke(new BasicStroke(1));
@@ -141,7 +142,7 @@ public class MapScaleNode extends G2DNode {
     private static final transient int    MAX_DIGITS = 0;
     private static final transient double EPSILON    = 0.01;
     private static final transient double TRIM_THRESHOLD_MAX_VALUE = Math.pow(10, 2);
-    private static final transient String[] SI_UNIT_LARGE_PREFIXES = { "m", "km" };
+    //private static final transient String[] SI_UNIT_LARGE_PREFIXES = { "m", "km" };
     
     private static final transient double[] SCALE_VALUES = { 2, 5, 10, 20, 50, 100, 200, 500, 1000, 2000, 5000, 10000, 20000, 50000, 100000, 200000, 500000, 1000000, 2000000, 50000000 };