Changeset 30

Timestamp:

07/27/07 19:16:10 (6 years ago)

Author:

saua

Message:

display length of current track (fixes #11)

Files:

• bbtracker/trunk/src/org/bbtracker/mobile/gui/StatusTile.java (modified) (3 diffs)
• bbtracker_common/trunk/src/org/bbtracker/Track.java (modified) (1 diff)
• bbtracker_common/trunk/src/org/bbtracker/TrackSegment.java (modified) (3 diffs)
• bbtracker_common/trunk/src/org/bbtracker/Utils.java (modified) (1 diff)

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

@@ -10 +10 @@
 
 public class StatusTile extends Tile {
-        public static final String MAX_DEGREE_STRING = "99" + Utils.DEGREE + "99" + Utils.MINUTE + "99.99" + Utils.SECOND +
+        private static final String MAX_DEGREE_STRING = "99" + Utils.DEGREE + "99" + Utils.MINUTE + "99.99" + Utils.SECOND +
                         "W";
+
+        private static final String MAX_SPEED_STRING = "888.8 km/h";
+
+        private static final String MAX_COURSE_STRING = "399" + Utils.DEGREE;
+
+        private static final String MAX_ELEVATION_STRING = "8888m";
 
         private static final int MARGIN = 2;
@@ -23 +29 @@
         private final int latWidth;
 
+        private final int speedWidth;
+
+        private final int courseWidth;
+
+        private final int elevationWidth;
+
         public StatusTile(final TrackManager manager) {
                 this.manager = manager;
                 font = Font.getFont(Font.FACE_MONOSPACE, Font.STYLE_PLAIN, Font.SIZE_SMALL);
                 latWidth = font.stringWidth(MAX_DEGREE_STRING);
+                System.out.println(latWidth);
+                speedWidth = font.stringWidth(MAX_SPEED_STRING);
+                System.out.println(speedWidth);
+                courseWidth = font.stringWidth(MAX_COURSE_STRING);
+                System.out.println(courseWidth);
+                elevationWidth = font.stringWidth(MAX_ELEVATION_STRING);
+                System.out.println(elevationWidth);
         }
 
@@ -63 +82 @@
                         elevation = "-m";
                 }
+                final String length;
+                if (track != null) {
+                        length = Utils.distanceToString(track.getLength());
+                } else {
+                        length = "-m";
+                }
 
                 int y = MARGIN;
 
-                final int leftColumn = MARGIN + latWidth;
-                final int middleColumn = MARGIN + latWidth * 2 + GAP;
-                final int rightBorder = width - MARGIN;
+                final int lonPos = MARGIN + latWidth;
+                final int latPos = MARGIN + latWidth * 2 + GAP;
+                final int rightPos = width - MARGIN;
 
-                g.drawString(lon, leftColumn, y, Graphics.TOP | Graphics.RIGHT);
-                g.drawString(lat, middleColumn, y, Graphics.TOP | Graphics.RIGHT);
-                g.drawString(elevation, rightBorder, y, Graphics.TOP | Graphics.RIGHT);
+                g.drawString(lon, lonPos, y, Graphics.TOP | Graphics.RIGHT);
+                g.drawString(lat, latPos, y, Graphics.TOP | Graphics.RIGHT);
+                g.drawString(length, rightPos, y, Graphics.TOP | Graphics.RIGHT);
                 y += font.getHeight();
-                g.drawString(speed, leftColumn, y, Graphics.TOP | Graphics.RIGHT);
-                g.drawString(course, middleColumn, y, Graphics.TOP | Graphics.RIGHT);
-                g.drawString(point, rightBorder, y, Graphics.TOP | Graphics.RIGHT);
+                g.drawString(speed, lonPos, y, Graphics.TOP | Graphics.RIGHT);
+                g.drawString(course, lonPos + GAP + GAP + courseWidth, y, Graphics.TOP | Graphics.RIGHT);
+                g.drawString(elevation, latPos, y, Graphics.TOP | Graphics.RIGHT);
+                g.drawString(point, rightPos, y, Graphics.TOP | Graphics.RIGHT);
         }
 

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

@@ -99 +99 @@
         public double getMinLongitude() {
                 return minLongitude;
+        }
+
+        public double getLength() {
+                final Enumeration e = segments.elements();
+                double length = 0d;
+                while (e.hasMoreElements()) {
+                        length += ((TrackSegment) e.nextElement()).getLength();
+                }
+                return length;
         }
 

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

@@ -17 +17 @@
 
         transient double maxLongitude = Double.MIN_VALUE;
+
+        transient double length = 0;
 
         TrackSegment() {
@@ -46 +48 @@
                         boundsChanged = true;
                 }
+                if (points.size() > 0) {
+                        final TrackPoint prevPoint = (TrackPoint) points.elementAt(points.size() - 1);
+                        final double dist = Utils.distance(prevPoint.getLatitude(), prevPoint.getLongitude(), lat, lon);
+                        length += dist;
+                }
                 points.addElement(point);
                 return boundsChanged;
@@ -56 +63 @@
         public int getPointCount() {
                 return points.size();
+        }
+
+        public double getLength() {
+                return length;
         }
 

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

@@ -206 +206 @@
                 return ((int) elevation) + "m";
         }
+
+        public static String distanceToString(final double length) {
+                if (length < 1000) {
+                        return ((int) length) + "m";
+                } else {
+                        return String.valueOf(((int) (length / 100)) / 10f) + "km";
+                }
+        }
 }