xiaoyan159/vtm
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Use baseline 160dpi in scaling, closes #236

Browse Source
This commit is contained in:
Emux
2016-11-13 12:23:32 +02:00
parent d82faad435
commit 58b5f2741b
24 changed files with 56 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
vtm/src/org/oscim/backend/CanvasAdapter.java
View File

@@ -43,10 +43,15 @@ public abstract class CanvasAdapter {
*/
static CanvasAdapter g;
/**
* Default dpi.
*/
public static final float DEFAULT_DPI = 160;
/**
* The dpi.
*/
public static float dpi = 240;
public static float dpi = DEFAULT_DPI;
/**
* The scale.

3
vtm/src/org/oscim/map/Animator.java
View File

@@ -1,6 +1,7 @@
/*
* Copyright 2013 Hannes Janetzek
* Copyright 2016 Stephan Leuschner
* Copyright 2016 devemux86
*
* This file is part of the OpenScienceMap project (http://www.opensciencemap.org).
*
@@ -180,7 +181,7 @@ public class Animator {
float duration = 500;
float flingFactor = 240 / CanvasAdapter.dpi;
float flingFactor = CanvasAdapter.DEFAULT_DPI / CanvasAdapter.dpi;
mVelocity.x = velocityX * flingFactor;
mVelocity.y = velocityY * flingFactor;
mVelocity.x = clamp(mVelocity.x, xmin, xmax);

2
vtm/src/org/oscim/scalebar/DefaultMapScaleBar.java
View File

@@ -49,7 +49,7 @@ public class DefaultMapScaleBar extends MapScaleBar {
private final Paint paintScaleTextStroke;
public DefaultMapScaleBar(Map map) {
this(map, CanvasAdapter.dpi / 240);
this(map, CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI);
}
public DefaultMapScaleBar(Map map, float scale) {

2
vtm/src/org/oscim/theme/ThemeLoader.java
View File

@@ -33,7 +33,7 @@ public class ThemeLoader {
public static IRenderTheme load(ThemeFile theme) throws ThemeException {
IRenderTheme t = XmlThemeBuilder.read(theme);
if (t != null)
t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.dpi / 240 - 1) * 0.5f);
t.scaleTextSize(CanvasAdapter.textScale + (CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI - 1));
return t;
}
}

19
vtm/src/org/oscim/theme/XmlThemeBuilder.java
View File

@@ -134,7 +134,7 @@ public class XmlThemeBuilder extends DefaultHandler {
private final ThemeFile mTheme;
private RenderTheme mRenderTheme;
private final float mScale;
private final float mScale, mScale2;
private Set<String> mCategories;
private XmlRenderThemeStyleLayer mCurrentLayer;
@@ -142,7 +142,8 @@ public class XmlThemeBuilder extends DefaultHandler {
public XmlThemeBuilder(ThemeFile theme) {
mTheme = theme;
mScale = CanvasAdapter.scale + (CanvasAdapter.dpi / 240 - 1) * 0.5f;
mScale = CanvasAdapter.scale + (CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI - 1);
mScale2 = CanvasAdapter.scale + (CanvasAdapter.dpi / CanvasAdapter.DEFAULT_DPI - 1) * 0.5f;
}
@Override
@@ -479,7 +480,7 @@ public class XmlThemeBuilder extends DefaultHandler {
b.color(value);
else if ("width".equals(name) || "stroke-width".equals(name)) {
b.strokeWidth = parseFloat(value) * mScale;
b.strokeWidth = parseFloat(value) * mScale2;
if (line == null) {
if (!isOutline)
validateNonNegative("width", b.strokeWidth);
@@ -496,7 +497,7 @@ public class XmlThemeBuilder extends DefaultHandler {
b.fixed = parseBoolean(value);
else if ("stipple".equals(name))
b.stipple = Math.round(parseInt(value) * mScale);
b.stipple = Math.round(parseInt(value) * mScale2);
else if ("stipple-stroke".equals(name))
b.stippleColor(value);
@@ -583,7 +584,7 @@ public class XmlThemeBuilder extends DefaultHandler {
else if ("stroke-width".equals(name)) {
float strokeWidth = Float.parseFloat(value);
validateNonNegative("stroke-width", strokeWidth);
b.strokeWidth = strokeWidth * mScale;
b.strokeWidth = strokeWidth * mScale2;
} else if ("fade".equals(name))
b.fadeScale = Integer.parseInt(value);
@@ -856,7 +857,7 @@ public class XmlThemeBuilder extends DefaultHandler {
b.strokeColor = Color.parseColor(value);
else if ("stroke-width".equals(name))
b.strokeWidth = Float.parseFloat(value) * mScale;
b.strokeWidth = Float.parseFloat(value) * mScale2;
else if ("caption".equals(name))
b.caption = Boolean.parseBoolean(value);
@@ -869,7 +870,7 @@ public class XmlThemeBuilder extends DefaultHandler {
else if ("dy".equals(name))
// NB: minus..
b.dy = -Float.parseFloat(value) * CanvasAdapter.dpi / 160;
b.dy = -Float.parseFloat(value) * mScale;
else if ("symbol".equals(name)) {
String lowValue = value.toLowerCase(Locale.ENGLISH);
@@ -911,7 +912,7 @@ public class XmlThemeBuilder extends DefaultHandler {
String value = attributes.getValue(i);
if ("r".equals(name) || "radius".equals(name))
radius = Float.parseFloat(value) * mScale;
radius = Float.parseFloat(value) * mScale2;
else if ("cat".equals(name))
cat = value;
@@ -926,7 +927,7 @@ public class XmlThemeBuilder extends DefaultHandler {
stroke = Color.parseColor(value);
else if ("stroke-width".equals(name))
strokeWidth = Float.parseFloat(value) * mScale;
strokeWidth = Float.parseFloat(value) * mScale2;
else
logUnknownAttribute(elementName, name, value, i);