Changeset 14

Timestamp:

07/25/07 21:25:52 (6 years ago)

Author:

saua

Message:

more usefull information display

Location:

bbtracker/trunk/src/org/bbtracker/mobile

Files:

• TrackListener.java (modified) (1 diff)
• TrackManager.java (modified) (7 diffs)
• gui/MainCanvas.java (modified) (2 diffs)
• gui/StatusTile.java (modified) (3 diffs)

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

@@ -6 +6 @@
         public void newPoint(TrackPoint newPoint, boolean boundsChanged, boolean newSegment);
 
+        public void currentPointChanged(final TrackPoint newPoint, int newIndex);
+
         public void stateChanged(int newState);
 }

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

@@ -35 +35 @@
         private TrackPoint currentPoint;
 
+        private int currentPointIndex = -1;
+
         private boolean trackInterrupted;
 
@@ -60 +62 @@
         }
 
+        public int getCurrentPointIndex() {
+                return currentPointIndex;
+        }
+
         public Track getTrack() {
                 return track;
@@ -68 +74 @@
                         return;
                 }
-                boolean boundsChanged = false;
-                boolean newSegment = false;
                 if (location.isValid()) {
+                        boolean boundsChanged = false;
+                        boolean newSegment = false;
                         if (trackInterrupted == true) {
                                 newSegment = true;
@@ -79 +85 @@
                                         coordinates.getLongitude(), coordinates.getAltitude(), location.getSpeed(), location.getCourse(),
                                         false);
-                        if (track != null && state != STATE_STATIC) {
+                        if (track != null) {
+                                currentPointIndex = track.getPointCount();
                                 boundsChanged = track.addPoint(trackPoint);
                         }
                         currentPoint = trackPoint;
                         fireNewPoint(currentPoint, boundsChanged, newSegment);
+                        fireCurrentPointChanged();
                         providerStateChanged(provider, provider.getState());
                 } else {
-                        fireNewPoint(null, boundsChanged, newSegment);
+                        fireNewPoint(null, false, false);
                 }
         }
@@ -142 +150 @@
         }
 
+        private void fireCurrentPointChanged() {
+                if (listeners == null) {
+                        return;
+                }
+
+                final Enumeration e = listeners.elements();
+                while (e.hasMoreElements()) {
+                        ((TrackListener) e.nextElement()).currentPointChanged(currentPoint, currentPointIndex);
+                }
+        }
+
         /**
          * Start a new track.
@@ -156 +175 @@
                 track = new Track(name);
                 state = STATE_TRACKING;
+
+                currentPointIndex = -1;
+                currentPoint = null;
+                fireStateChanged();
+                fireCurrentPointChanged();
         }
 
@@ -174 +198 @@
                 if (track == null || track.getPointCount() == 0) {
                         currentPoint = null;
+                        currentPointIndex = -1;
                 } else {
                         currentPoint = track.getPoint(0);
-                }
+                        currentPointIndex = 0;
+                }
+                fireStateChanged();
+                fireCurrentPointChanged();
         }
 

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

@@ -87 +87 @@
 
         public void newPoint(final TrackPoint newPoint, final boolean boundsChanged, final boolean newSegment) {
-                trackTile.setCurrentPoint(newPoint);
                 if (boundsChanged) {
                         trackTile.onResize(); // XXX Make that nicer
                 }
-                if (isShown()) {
-                        repaint();
-                }
+                repaint();
+        }
+
+        public void currentPointChanged(final TrackPoint newPoint, final int newIndex) {
+                trackTile.setCurrentPoint(newPoint);
+                repaint();
         }
 
         public void stateChanged(final int newState) {
-                if (isShown()) {
-                        repaint();
-                }
+                repaint();
         }
 
@@ -119 +119 @@
                         setTrack(newTrack);
                 }
+                trackTile.onResize();
                 manager.addPointListener(this);
         }

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

@@ -10 +10 @@
 
 public class StatusTile extends Tile {
-
-        private static final int TOP_LEFT = Graphics.TOP | Graphics.LEFT;
-
-        private static final String LABEL_LONGITUDE = "Long.: ";
-
-        private static final String LABEL_LATITUDE = "Lat.: ";
-
-        private static final String LABEL_POINTS = "Points: ";
-
-        private static final String LABEL_AGE = "Age: ";
-
-        private static final String LABEL_SPEED = "Speed: ";
-
-        private static final String LABEL_COURSE = "Course: ";
+        public static final String MAX_DEGREE_STRING = "99" + Utils.DEGREE + "99" + Utils.MINUTE + "99.99" + Utils.SECOND +
+                        "W";
 
         private static final int MARGIN = 2;
 
+        private static final int GAP = 5;
+
         private final TrackManager manager;
 
-        private final Font labelFont;
+        private final Font font;
 
-        private final Font valueFont;
-
-        private final int lineHeight;
-
-        private final int leftLabelWidth;
-
-        private final int rightLabelWidth;
-
-        private final int rightValueWidth;
+        private final int latWidth;
 
         public StatusTile(final TrackManager manager) {
                 this.manager = manager;
-                labelFont = Font.getFont(Font.FACE_PROPORTIONAL, Font.STYLE_BOLD, Font.SIZE_SMALL);
-                valueFont = Font.getFont(Font.FACE_MONOSPACE, Font.STYLE_PLAIN, Font.SIZE_SMALL);
-                lineHeight = Math.max(labelFont.getHeight(), valueFont.getHeight());
-
-                int w;
-
-                w = maxWidth(labelFont, LABEL_LATITUDE, -1);
-                w = maxWidth(labelFont, LABEL_LONGITUDE, w);
-                w = maxWidth(labelFont, LABEL_SPEED, w);
-                leftLabelWidth = w;
-
-                w = maxWidth(labelFont, LABEL_POINTS, -1);
-                w = maxWidth(labelFont, LABEL_AGE, w);
-                w = maxWidth(labelFont, LABEL_COURSE, w);
-                rightLabelWidth = w;
-
-                rightValueWidth = valueFont.stringWidth("9999");
-        }
-
-        private static final int maxWidth(final Font f, final String s, final int prevMax) {
-                final int w = f.stringWidth(s);
-                return Math.max(prevMax, w);
+                font = Font.getFont(Font.FACE_MONOSPACE, Font.STYLE_PLAIN, Font.SIZE_SMALL);
+                latWidth = font.stringWidth(MAX_DEGREE_STRING);
         }
 
@@ -70 +32 @@
                 final Track track = manager.getTrack();
                 final TrackPoint p = manager.getCurrentPoint();
+                final int pi = manager.getCurrentPointIndex();
 
                 g.setColor(0x00ffffff);
                 g.fillRect(0, 0, width, height);
                 g.setColor(0x00000000);
-                g.setFont(labelFont);
+                g.setFont(font);
 
-                final String points = track == null ? "-" : String.valueOf(track.getPointCount());
+                final String point;
+                if (pi == -1) {
+                        point = "-";
+                } else {
+                        point = (pi + 1) + "/" + track.getPointCount();
+                }
                 final String lon;
                 final String lat;
-                final String age;
                 final String speed;
                 final String course;
+                final String elevation;
                 if (p != null) {
                         lon = Utils.longitudeToString(p.getLongitude());
@@ -87 +55 @@
                         speed = Utils.speedToString(p.getSpeed());
                         course = Utils.courseToString(p.getCourse());
-                        age = String.valueOf(((int) (System.currentTimeMillis() - p.getTimestamp()) / 100) / 10f) + 's';
+                        elevation = Utils.elevationToString(p.getElevation());
                 } else {
                         lon = "-";
                         lat = "-";
-                        speed = "-";
-                        course = "-";
-                        age = "-";
+                        speed = "- km/h";
+                        course = "-" + Utils.DEGREE;
+                        elevation = "-m";
                 }
 
                 int y = MARGIN;
-                int left = MARGIN;
-                int right = width - rightLabelWidth - rightValueWidth - MARGIN;
-                g.setFont(labelFont);
-                g.drawString(LABEL_LONGITUDE, left, y, TOP_LEFT);
-                g.drawString(LABEL_POINTS, right, y, TOP_LEFT);
-                y += lineHeight;
-                g.drawString(LABEL_LATITUDE, left, y, TOP_LEFT);
-                g.drawString(LABEL_AGE, right, y, TOP_LEFT);
-                y += lineHeight;
-                g.drawString(LABEL_SPEED, left, y, TOP_LEFT);
-                g.drawString(LABEL_COURSE, right, y, TOP_LEFT);
 
-                left += leftLabelWidth;
-                right += rightLabelWidth;
-                y = MARGIN;
-                g.drawString(lon, left, y, TOP_LEFT);
-                g.drawString(points, right, y, TOP_LEFT);
-                y += lineHeight;
-                g.drawString(lat, left, y, TOP_LEFT);
-                g.drawString(age, right, y, TOP_LEFT);
-                y += lineHeight;
-                g.drawString(speed, left, y, TOP_LEFT);
-                g.drawString(course, right, y, TOP_LEFT);
+                final int leftColumn = MARGIN + latWidth;
+                final int middleColumn = MARGIN + latWidth * 2 + GAP;
+                final int rightBorder = 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);
+                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);
         }
 
         public int getPreferredHeight() {
-                return MARGIN + lineHeight * 3 + MARGIN;
+                return (MARGIN + font.getHeight()) * 2;
         }
 }