X-Git-Url: https://gitweb.fperrin.net/?a=blobdiff_plain;f=tim%2Fprune%2Fgui%2Fmap%2FScaleBar.java;h=37e12b65bfbbdebb76216869232d4f3089ee35f3;hb=4d5796d02a15808311c09448d79e6e7d1de9d636;hp=0f65db91c5e9c2fe1eb78a20b01646f3561155a0;hpb=112bb0c9b46894adca9a33ed8c99ea712b253185;p=GpsPrune.git diff --git a/tim/prune/gui/map/ScaleBar.java b/tim/prune/gui/map/ScaleBar.java index 0f65db9..37e12b6 100644 --- a/tim/prune/gui/map/ScaleBar.java +++ b/tim/prune/gui/map/ScaleBar.java @@ -5,18 +5,20 @@ import java.awt.Dimension; import java.awt.Graphics; import javax.swing.JPanel; -import tim.prune.Config; import tim.prune.I18nManager; +import tim.prune.config.ColourScheme; +import tim.prune.config.Config; +import tim.prune.data.Unit; /** - * Class to show a scale bar on the main map of Prune + * Class to show a scale bar on the main map of GpsPrune */ public class ScaleBar extends JPanel { /** zoom level */ private int _zoomLevel = -1; - /** y tile number */ - private int _yTile = -1; + /** y position */ + private double _yPos = 0.0; // Dimensions /** Offset from left side in pixels */ @@ -28,18 +30,14 @@ public class ScaleBar extends JPanel /** Margin between bar and end text in pixels */ private static final int MARGIN_WIDTH = 8; - /** metric scales for each zoom level */ - private static final int[] _metricScales = {10000, 5000, 2000, 2000, 1000, 500, 200, 100, - 50, 20, 10, 5, 2, 2, 1, -2, -5, -10, -20, -50, -100, -200}; + /** scales for each zoom level */ + private static final int[] _scales = {10000, 5000, 2000, 2000, 1000, 500, 200, 100, + 50, 20, 10, 5, 2, 2, 1, + -2, -5, -10, -20, -50, -100, -200}; /** pixel counts for each zoom level (metric) */ - private static final int[] _metricPixels = {64, 64, 51, 102, 102, 102, 81, 81, - 81, 65, 65, 65, 52, 105, 105, 105, 83, 83, 83, 67, 67, 67}; - /** imperial scales for each zoom level (num miles) */ - private static final int[] _mileScales = {10000, 10000, 5000, 2000, 2000, 1000, 500, 200, - 100, 50, 20, 10, 5, 2, 1, -2, -2, -5, -10, -20, -50, -100}; - /** pixel counts for each zoom level (miles) */ - private static final int[] _milePixels = {79, 79, 79, 64, 127, 127, 127, 102, - 102, 102, 81, 81, 81, 65, 65, 65, 130, 104, 104, 104, 104, 83, 83}; + private static final double[] _metricPixels = {64, 64, 51, 102, 102, 102, 81, 81, + 81, 65, 65, 65, 52, 105, 105, + 105, 83, 83, 83, 67, 67, 67}; /** @@ -62,16 +60,15 @@ public class ScaleBar extends JPanel if (_zoomLevel > -1) { try { - boolean useMetric = Config.getConfigBoolean(Config.KEY_METRIC_UNITS); - int rightSide = LEFT_OFFSET + (useMetric?_metricPixels[_zoomLevel]:_milePixels[_zoomLevel]); - int scale = (useMetric?_metricScales[_zoomLevel]:_mileScales[_zoomLevel]); + final double distScaleFactor = Config.getUnitSet().getDistanceUnit().getMultFactorFromStd(); + double drightSide = LEFT_OFFSET + _metricPixels[_zoomLevel] / 1000.0 / distScaleFactor; + int scale = _scales[_zoomLevel]; - // work out cos(latitude) from y tile and zoom, and apply to scale - final double n = Math.pow(2, _zoomLevel); - final double angle = Math.PI * (1 - 2.0*_yTile/n); + // work out cos(latitude) from y position, and apply to scale + final double angle = Math.PI * (1 - 2*_yPos); final double lat = Math.atan(Math.sinh(angle)); final double cosLat = Math.cos(lat); - rightSide = (int) (rightSide / cosLat); + int rightSide = (int) (drightSide / cosLat); // Adjust if scale is too large while (rightSide > 300) { @@ -80,32 +77,71 @@ public class ScaleBar extends JPanel // Abort if scale is now less than 1 unit (shouldn't ever be) if (scale < 1) {return;} } + // Abort if scale is negative (around poles) + if (rightSide < 1) {return;} + // Determine colours to use + Color barColour = Config.getColourScheme().getColour(ColourScheme.IDX_TEXT); + Color blankColour = new Color(255-barColour.getRed(), 255-barColour.getGreen(), 255-barColour.getBlue()); + // Should this blank colour be set to saturation zero? + // Draw blank bars behind + inG.setColor(blankColour); + inG.drawLine(LEFT_OFFSET, Y_OFFSET-1, rightSide+2, Y_OFFSET-1); + inG.drawLine(LEFT_OFFSET, Y_OFFSET+2, rightSide+2, Y_OFFSET+2); + inG.drawLine(LEFT_OFFSET-1, Y_OFFSET+2, LEFT_OFFSET-1, Y_OFFSET-TICK_HEIGHT); + inG.drawLine(LEFT_OFFSET+2, Y_OFFSET+2, LEFT_OFFSET+2, Y_OFFSET-TICK_HEIGHT); + inG.drawLine(rightSide-1, Y_OFFSET+2, rightSide-1, Y_OFFSET-TICK_HEIGHT); + inG.drawLine(rightSide+2, Y_OFFSET+2, rightSide+2, Y_OFFSET-TICK_HEIGHT); // horizontal - inG.setColor(Color.BLACK); + inG.setColor(barColour); inG.drawLine(LEFT_OFFSET, Y_OFFSET, rightSide, Y_OFFSET); inG.drawLine(LEFT_OFFSET, Y_OFFSET+1, rightSide, Y_OFFSET+1); // 0 tick inG.drawLine(LEFT_OFFSET, Y_OFFSET, LEFT_OFFSET, Y_OFFSET-TICK_HEIGHT); inG.drawLine(LEFT_OFFSET+1, Y_OFFSET, LEFT_OFFSET+1, Y_OFFSET-TICK_HEIGHT); // end tick - inG.drawLine(rightSide, Y_OFFSET, rightSide, Y_OFFSET-TICK_HEIGHT); - inG.drawLine(rightSide+1, Y_OFFSET, rightSide+1, Y_OFFSET-TICK_HEIGHT); + inG.drawLine(rightSide, Y_OFFSET+1, rightSide, Y_OFFSET-TICK_HEIGHT); + inG.drawLine(rightSide+1, Y_OFFSET+1, rightSide+1, Y_OFFSET-TICK_HEIGHT); // text - String text = (scale>0?(""+scale):("1/"+(-scale))) + " " + I18nManager.getText(useMetric?"units.kilometres.short":"units.miles.short"); + String text = getScaleText(scale, Config.getUnitSet().getDistanceUnit()); + inG.setColor(blankColour); + inG.drawString(text, rightSide+MARGIN_WIDTH-1, Y_OFFSET); + inG.drawString(text, rightSide+MARGIN_WIDTH+1, Y_OFFSET); + inG.drawString(text, rightSide+MARGIN_WIDTH, Y_OFFSET-1); + inG.drawString(text, rightSide+MARGIN_WIDTH, Y_OFFSET+1); + inG.setColor(barColour); inG.drawString(text, rightSide+MARGIN_WIDTH, Y_OFFSET); } catch (ArrayIndexOutOfBoundsException ai) {} } } + /** + * Get the scale text for the given scale + * @param inScale scale number + * @param inDistUnit distance unit + * @return scale text as string + */ + private static String getScaleText(int inScale, Unit inDistUnit) + { + if (inScale > 0) { + // Positive scale means km or miles + return "" + inScale + " " + + I18nManager.getText(inDistUnit.getShortnameKey()); + } + // negative scale means a fraction + return "" + (-1.0 / inScale) + " " + I18nManager.getText(inDistUnit.getShortnameKey()); + // might be nice to say 100m instead of 0.1km, 275ft instead of 0.2miles, etc - need to be done by Unit itself? + } + /** * Update the scale level * @param inZoom new zoom level + * @param inYPos y position, where 0 is north pole, 1 is south pole */ - public void updateScale(int inZoom, int inYtile) + public void updateScale(int inZoom, double inYPos) { _zoomLevel = inZoom; - _yTile = inYtile; + _yPos = inYPos; } }