Changeset 36 for bbtracker/trunk/src/org/bbtracker/mobile/gui/TrackTile.java

Timestamp:

07/28/07 19:48:14 (5 years ago)

Author:

saua

Message:

• refactor calculating the displayable strings into its own (abstract) class UnitConverter?
• add calculating the size of the scale bar there as well
• move existing code to MetricUnitConverter? and refactor it quite a bit (lots of code that would be identifcal in ImperialUnitConverter? was moved out)
• implement ImperialUnitConverter?
• make StatusTile? and TrackTile? use those converters
• add setting to Preferences
• add GUI for setting to OptionsForm?

This should fix Issue #13

File:

• bbtracker/trunk/src/org/bbtracker/mobile/gui/TrackTile.java (modified) (6 diffs)

bbtracker/trunk/src/org/bbtracker/mobile/gui/TrackTile.java

@@ -10 +10 @@
 import org.bbtracker.TrackSegment;
 import org.bbtracker.Utils;
+import org.bbtracker.UnitConverter.ScaleConfiguration;
+import org.bbtracker.mobile.Preferences;
 
 public class TrackTile extends Tile {
@@ -30 +32 @@
         private static final int SCALE_HEIGTH = 5;
 
+        private final Track track;
+
         private double minimumLongitude, minimumLatitude;
 
         private double scale;
 
-        private final Track track;
-
         private TrackPoint currentPoint;
 
         private int scaleSizeInPixel;
 
-        private int scaleSize;
+        private String scaleLabelCenter;
+
+        private String scaleLabelRight;
 
         public TrackTile(final Track track) {
@@ -87 +91 @@
                                 .distance(minimumLatitude, minimumLongitude, minimumLatitude, maximumLongitude);
                 if (widthInMeter < 1) {
-                        scaleSize = 0;
-                        return;
-                }
-
-                final int metersAvailableForScale = (int) (widthInMeter * 0.9);
-
-                scaleSize = 1;
-                while (scaleSize < metersAvailableForScale / 10) {
-                        scaleSize = scaleSize * 10;
-                }
-                if (scaleSize * 5 < metersAvailableForScale) {
-                        scaleSize = scaleSize * 5;
-                } else if (scaleSize * 2 < metersAvailableForScale) {
-                        scaleSize = scaleSize * 2;
-                }
-                scaleSizeInPixel = (int) (scaleSize * (width / widthInMeter));
+                        scaleSizeInPixel = 0;
+                        return;
+                }
+
+                final double availableLengthInMeter = widthInMeter * 0.9;
+
+                final ScaleConfiguration conf = Preferences.getInstance().getUnitsConverter().getScaleConfiguration(
+                                availableLengthInMeter);
+
+                switch (conf.lengthInUnits) {
+                case 1:
+                        scaleLabelCenter = "0.5";
+                        break;
+                case 5:
+                        scaleLabelCenter = "2.5";
+                        break;
+                default:
+                        scaleLabelCenter = String.valueOf(conf.lengthInUnits / 2);
+                }
+                scaleLabelRight = conf.lengthInUnits + " " + conf.unit;
+
+                scaleSizeInPixel = (int) ((conf.lengthInMeter / widthInMeter) * width);
         }
 
@@ -116 +126 @@
                         return;
                 }
-                final int segmentCount = track.getSegmentCount();
-                if (segmentCount < 1 || track.getSegment(0).getPointCount() == 0) {
+                if (track.getPointCount() == 0) {
                         return;
                 }
@@ -183 +192 @@
 
         private void drawScale(final Graphics g) {
-                if (scaleSize == 0) {
-                        return;
-                }
-
-                String unit;
-                int displayScaleSize;
-
-                if (scaleSize >= 1000) {
-                        unit = "km";
-                        displayScaleSize = scaleSize / 1000;
-                } else {
-                        unit = "m";
-                        displayScaleSize = scaleSize;
-                }
-
-                final String leftLabel = "0";
-                final String middleLabel;
-                switch (displayScaleSize) {
-                case 1:
-                        middleLabel = "0.5";
-                        break;
-                case 5:
-                        middleLabel = "2.5";
-                        break;
-                default:
-                        middleLabel = String.valueOf(displayScaleSize / 2);
-                }
-                final String rightLabel = displayScaleSize + " " + unit;
+                if (scaleSizeInPixel == 0) {
+                        return;
+                }
 
                 final Font font = Font.getFont(Font.FACE_SYSTEM, Font.STYLE_PLAIN, Font.SIZE_SMALL);
 
-                final int left = (font.stringWidth(leftLabel) / 2) + 2;
+                final int left = (font.stringWidth("0") / 2) + 2;
                 g.setFont(font);
                 g.setColor(0x00000000);
@@ -221 +205 @@
 
                 final int textBottom = height - 4 - SCALE_HEIGTH;
-                g.drawString(leftLabel, left, textBottom, Graphics.BOTTOM | Graphics.HCENTER);
-                g.drawString(middleLabel, left + (scaleSizeInPixel / 2), textBottom, Graphics.BOTTOM | Graphics.HCENTER);
-                g.drawString(rightLabel, left + scaleSizeInPixel, textBottom, Graphics.BOTTOM | Graphics.HCENTER);
+                g.drawString("0", left, textBottom, Graphics.BOTTOM | Graphics.HCENTER);
+                g.drawString(scaleLabelCenter, left + (scaleSizeInPixel / 2), textBottom, Graphics.BOTTOM | Graphics.HCENTER);
+                g.drawString(scaleLabelRight, left + scaleSizeInPixel, textBottom, Graphics.BOTTOM | Graphics.HCENTER);
         }
 }