Changeset 36

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

Files:

• bbtracker/trunk/src/org/bbtracker/mobile/Preferences.java (modified) (7 diffs)
• bbtracker/trunk/src/org/bbtracker/mobile/gui/OptionsForm.java (modified) (4 diffs)
• bbtracker/trunk/src/org/bbtracker/mobile/gui/StatusTile.java (modified) (2 diffs)
• bbtracker/trunk/src/org/bbtracker/mobile/gui/TrackTile.java (modified) (6 diffs)
• bbtracker_common/trunk/src/org/bbtracker/ImperialUnitConverter.java (added)
• bbtracker_common/trunk/src/org/bbtracker/MetricUnitConverter.java (added)
• bbtracker_common/trunk/src/org/bbtracker/UnitConverter.java (added)
• bbtracker_common/trunk/src/org/bbtracker/Utils.java (modified) (4 diffs)

bbtracker/trunk/src/org/bbtracker/mobile/Preferences.java

@@ -13 +13 @@
 import javax.microedition.rms.RecordStoreNotFoundException;
 
+import org.bbtracker.ImperialUnitConverter;
+import org.bbtracker.MetricUnitConverter;
+import org.bbtracker.UnitConverter;
+
 public class Preferences {
         private static final String RECORD_STORE_NAME = "Preferences";
@@ -24 +28 @@
         public static String[] START_ACTIONS = new String[] { "Do nothing", "Initialize GPS", "Start new track" };
 
+        public static final int EXPORT_KML = 0;
+
+        public static final int EXPORT_GPx = 1;
+
         public static String[] EXPORT_FORMATS = new String[] { "KML (Google Earth)", "GPX" };
+
+        public static final int UNITS_METRIC = 0;
+
+        public static final int UNITS_IMPERIAL = 1;
+
+        public static String[] UNITS = new String[] { "Metric (km/h, km, m)", "Imperial (mph, miles, feet)" };
 
         private static Preferences instance;
@@ -50 +64 @@
         private int exportFormats = 0x03; // export format 0 and 1 are set
 
+        private int units = UNITS_METRIC;
+
         private String exportDirectory;
+
+        private UnitConverter unitConverter;
 
         private Preferences() {
@@ -69 +87 @@
         public void setStartAction(final int startAction) {
                 this.startAction = startAction;
+        }
+
+        public String getExportDirectory() {
+                return exportDirectory;
+        }
+
+        public void setExportDirectory(final String exportDirectory) {
+                this.exportDirectory = exportDirectory;
+        }
+
+        public void setExportFormat(final int index, final boolean value) {
+                if (index >= EXPORT_FORMATS.length || index < 0) {
+                        throw new IllegalArgumentException();
+                }
+                if (value) {
+                        exportFormats |= 1 << index;
+                } else {
+                        exportFormats &= ~(1 << index);
+                }
+        }
+
+        public boolean getExportFormat(final int index) {
+                return (exportFormats & (1 << index)) != 0;
+        }
+
+        public int getUnits() {
+                return units;
+        }
+
+        public void setUnits(final int units) {
+                if (units != UNITS_METRIC && units != UNITS_IMPERIAL) {
+                        throw new IllegalArgumentException();
+                }
+                this.units = units;
+                unitConverter = null;
+        }
+
+        public UnitConverter getUnitsConverter() {
+                if (unitConverter == null) {
+                        switch (units) {
+                        case UNITS_METRIC:
+                                unitConverter = new MetricUnitConverter();
+                                break;
+                        case UNITS_IMPERIAL:
+                                unitConverter = new ImperialUnitConverter();
+                                break;
+                        default:
+                                throw new IllegalStateException();
+                        }
+                }
+                return unitConverter;
         }
 
@@ -103 +172 @@
                         }
                         exportFormats = in.readInt();
+                        units = in.readInt();
 
                         in.close();
@@ -140 +210 @@
                         }
                         out.writeInt(exportFormats);
+                        out.writeInt(units);
 
                         out.close();
@@ -168 +239 @@
                 }
         }
-
-        public String getExportDirectory() {
-                return exportDirectory;
-        }
-
-        public void setExportDirectory(final String exportDirectory) {
-                this.exportDirectory = exportDirectory;
-        }
-
-        public void setExportFormat(final int index, final boolean value) {
-                if (index >= EXPORT_FORMATS.length || index < 0) {
-                        throw new IllegalArgumentException();
-                }
-                if (value) {
-                        exportFormats |= 1 << index;
-                } else {
-                        exportFormats &= ~(1 << index);
-                }
-        }
-
-        public boolean getExportFormat(final int index) {
-                return (exportFormats & (1 << index)) != 0;
-        }
 }

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

@@ -34 +34 @@
         private final ChoiceGroup exportFormatGroup;
 
+        private final ChoiceGroup unitsGroup;
+
         public OptionsForm(final TrackManager trackManager) {
                 super("Options");
@@ -43 +45 @@
                 sampleField = new TextField("Sample Interval in seconds: ", String.valueOf(pref.getSampleInterval()), 5,
                                 TextField.NUMERIC);
-                startTypeGroup = new ChoiceGroup("Startup action: ", Choice.EXCLUSIVE, Preferences.START_ACTIONS, null);
+
+                unitsGroup = new ChoiceGroup("Units: ", Choice.POPUP, Preferences.UNITS, null);
+                unitsGroup.setSelectedIndex(pref.getUnits(), true);
+
+                startTypeGroup = new ChoiceGroup("Startup action: ", Choice.POPUP, Preferences.START_ACTIONS, null);
                 startTypeGroup.setSelectedIndex(pref.getStartAction(), true);
+
                 directoryField = new TextField("Export directory: ", pref.getExportDirectory(), 100, TextField.URL);
                 browseCommand = new Command("Browse", Command.ITEM, 1);
@@ -56 +63 @@
 
                 append(sampleField);
+                append(unitsGroup);
                 append(startTypeGroup);
                 append(directoryField);
@@ -80 +88 @@
                                         pref.setExportFormat(i, exportFormatGroup.isSelected(i));
                                 }
+
+                                pref.setUnits(unitsGroup.getSelectedIndex());
 
                                 pref.store();

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

@@ -6 +6 @@
 import org.bbtracker.Track;
 import org.bbtracker.TrackPoint;
+import org.bbtracker.UnitConverter;
 import org.bbtracker.Utils;
+import org.bbtracker.mobile.Preferences;
 import org.bbtracker.mobile.TrackManager;
 
@@ -50 +52 @@
                         point = (pi + 1) + "/" + track.getPointCount();
                 }
-                final String lon;
-                final String lat;
-                final String speed;
-                final String course;
-                final String elevation;
+                double lonValue = Double.NaN;
+                double latValue = Double.NaN;
+                float speedValue = Float.NaN;
+                float courseValue = Float.NaN;
+                float elevationValue = Float.NaN;
+                double lengthValue = Double.NaN;
                 if (p != null) {
-                        lon = Utils.longitudeToString(p.getLongitude());
-                        lat = Utils.latitudeToString(p.getLatitude());
-                        speed = Utils.speedToString(p.getSpeed());
-                        course = Utils.courseToString(p.getCourse());
-                        elevation = Utils.elevationToString(p.getElevation());
-                } else {
-                        lon = "-";
-                        lat = "-";
-                        speed = "- km/h";
-                        course = "-" + Utils.DEGREE;
-                        elevation = "-m";
+                        lonValue = p.getLongitude();
+                        latValue = p.getLatitude();
+                        speedValue = p.getSpeed();
+                        courseValue = p.getCourse();
+                        elevationValue = p.getElevation();
                 }
-                final String length;
                 if (track != null) {
-                        length = Utils.distanceToString(track.getLength());
-                } else {
-                        length = "-m";
+                        lengthValue = track.getLength();
                 }
+
+                final String lon = Utils.longitudeToString(lonValue);
+                final String lat = Utils.latitudeToString(latValue);
+                final String course = Utils.courseToString(courseValue);
+
+                final UnitConverter unit = Preferences.getInstance().getUnitsConverter();
+                final String speed = unit.speedToString(speedValue);
+                final String elevation = unit.elevationToString(elevationValue);
+                final String length = unit.distanceToString(lengthValue);
 
                 int y = MARGIN;

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);
         }
 }

bbtracker_common/trunk/src/org/bbtracker/Utils.java

@@ -16 +16 @@
         public static final char SECOND = '\u2033';
 
-        private static final float MS_TO_KMH_FACTOR = 3.6f;
-
         private static final double WGS84_A = 6378137;
 
@@ -37 +35 @@
 
         public static String degreesToString(final double value, final char positiveChar, final char negativeChar) {
+                if (Double.isNaN(value)) {
+                        return "-";
+                }
                 char c;
                 double d;
@@ -131 +132 @@
         }
 
-        /**
-         * @param speed
-         *            the speed in m/s
-         * @return a human readable String containing the speed in km/h.
-         */
-        public static String speedToString(final float speed) {
-                final float value = speed * MS_TO_KMH_FACTOR;
-                return String.valueOf(((int) (value * 10)) / 10f) + " km/h";
-        }
-
-        public static String courseToString(final float course) {
-                if (Float.isNaN(course)) {
-                        return "???" + DEGREE;
-                } else {
-                        return String.valueOf((int) (Math.floor(course + 0.5d))) + DEGREE;
-                }
-        }
-
         public static String dateToString(final Date date) {
                 final String orig = date.toString();
@@ -203 +186 @@
         }
 
-        public static String elevationToString(final float elevation) {
-                return ((int) elevation) + "m";
-        }
-
-        public static String distanceToString(final double length) {
-                if (length < 1000) {
-                        return ((int) length) + "m";
+        /*
+         * (non-Javadoc)
+         * 
+         * @see org.bbtracker.UnitConverter#courseToString(float)
+         */
+        public static String courseToString(final float course) {
+                if (Float.isNaN(course)) {
+                        return "???" + DEGREE;
                 } else {
-                        return String.valueOf(((int) (length / 100)) / 10f) + "km";
+                        return String.valueOf((int) (Math.floor(course + 0.5d))) + DEGREE;
                 }
         }