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

Map scale bar: allow scaling its size #84

Browse Source
This commit is contained in:
Emux 2016-07-22 14:56:47 +03:00
parent b96890b24b
commit ea36c8c69f
1 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
vtm-android/src/org/oscim/android/scalebar/DefaultMapScaleBar.java
View File

@ -53,9 +53,13 @@ public class DefaultMapScaleBar extends MapScaleBar {
private final Rect rect = new Rect(); private final Rect rect = new Rect();
public DefaultMapScaleBar(Map map) { public DefaultMapScaleBar(Map map) {
super(map, (int) (BITMAP_WIDTH * CanvasAdapter.dpi / 160), (int) (BITMAP_HEIGHT * CanvasAdapter.dpi / 160)); this(map, CanvasAdapter.dpi / 160);
}
this.scale = CanvasAdapter.dpi / 160; public DefaultMapScaleBar(Map map, float scale) {
super(map, (int) (BITMAP_WIDTH * scale), (int) (BITMAP_HEIGHT * scale));
this.scale = scale;
this.scaleBarMode = ScaleBarMode.BOTH; this.scaleBarMode = ScaleBarMode.BOTH;
this.secondaryDistanceUnitAdapter = ImperialUnitAdapter.INSTANCE; this.secondaryDistanceUnitAdapter = ImperialUnitAdapter.INSTANCE;
@ -137,14 +141,14 @@ public class DefaultMapScaleBar extends MapScaleBar {
lengthAndValue2 = new ScaleBarLengthAndValue(0, 0); lengthAndValue2 = new ScaleBarLengthAndValue(0, 0);
} }
drawScaleBar(canvas, lengthAndValue.scaleBarLength, lengthAndValue2.scaleBarLength, this.paintScaleBarStroke, scale); drawScaleBar(canvas, lengthAndValue.scaleBarLength, lengthAndValue2.scaleBarLength, this.paintScaleBarStroke, this.scale);
drawScaleBar(canvas, lengthAndValue.scaleBarLength, lengthAndValue2.scaleBarLength, this.paintScaleBar, scale); drawScaleBar(canvas, lengthAndValue.scaleBarLength, lengthAndValue2.scaleBarLength, this.paintScaleBar, this.scale);
String scaleText1 = this.distanceUnitAdapter.getScaleText(lengthAndValue.scaleBarValue); String scaleText1 = this.distanceUnitAdapter.getScaleText(lengthAndValue.scaleBarValue);
String scaleText2 = this.scaleBarMode == ScaleBarMode.BOTH ? this.secondaryDistanceUnitAdapter.getScaleText(lengthAndValue2.scaleBarValue) : ""; String scaleText2 = this.scaleBarMode == ScaleBarMode.BOTH ? this.secondaryDistanceUnitAdapter.getScaleText(lengthAndValue2.scaleBarValue) : "";
drawScaleText(canvas, scaleText1, scaleText2, this.paintScaleTextStroke, scale); drawScaleText(canvas, scaleText1, scaleText2, this.paintScaleTextStroke, this.scale);
drawScaleText(canvas, scaleText1, scaleText2, this.paintScaleText, scale); drawScaleText(canvas, scaleText1, scaleText2, this.paintScaleText, this.scale);
} }
private void drawScaleBar(Canvas canvas, int scaleBarLength1, int scaleBarLength2, Paint paint, float scale) { private void drawScaleBar(Canvas canvas, int scaleBarLength1, int scaleBarLength2, Paint paint, float scale) {