Changeset 197

Timestamp:

05/02/08 15:04:09 (5 years ago)

Author:

saua

Message:

#82: Support pausing the current track
simple implementation ... I really need to think about more powerfull status messages ...

Location:

bbtracker/trunk/src/org/bbtracker/mobile

Files:

• TrackManager.java (modified) (5 diffs)
• gui/MainCanvas.java (modified) (8 diffs)

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

@@ -51 +51 @@
         private int state;
 
+        // true if no new points are recorded in TRACKING state.
+        private boolean paused;
+
         protected LocationProvider provider;
 
@@ -77 +80 @@
                                         trackInterrupted = false;
                                 }
+                                boolean currentPointChanged;
                                 if (track != null) {
-                                        final int pointCount = track.getPointCount();
-                                        if (currentPointIndex == pointCount - 1) {
-                                                // activate the new point only, when the last point is currently selected.
-                                                currentPointIndex = pointCount;
-                                                currentPoint = location;
+                                        currentPointChanged = false;
+                                        if (!paused) {
+                                                final int pointCount = track.getPointCount();
+                                                if (currentPointIndex == pointCount - 1) {
+                                                        // activate the new point only, when the last point is currently selected.
+                                                        currentPointIndex = pointCount;
+                                                        currentPoint = location;
+                                                        currentPointChanged = true;
+                                                }
+                                                if (newSegment) {
+                                                        track.newSegment();
+                                                }
+                                                boundsChanged = track.addPoint(location);
                                         }
-                                        boundsChanged = track.addPoint(location);
                                 } else {
                                         currentPoint = location;
+                                        currentPointChanged = true;
                                 }
-                                fireNewPoint(currentPoint, boundsChanged, newSegment);
-                                fireCurrentPointChanged();
-                                providerStateChanged(provider, provider.getState());
+                                fireNewPoint(location, boundsChanged, newSegment);
+                                if (currentPointChanged) {
+                                        fireCurrentPointChanged();
+                                }
                         } else {
                                 fireNewPoint(null, false, false);
@@ -97 +110 @@
 
                 public void providerStateChanged(final LocationProvider provider, final int newState) {
-                        // TODO Auto-generated method stub
-
+                        // noop
                 }
         };
@@ -182 +194 @@
                 }
                 return changed;
+        }
+
+        public void pauseTracking() {
+                if (state != STATE_TRACKING) {
+                        throw new IllegalStateException("Not in tracking state! Can't pause tracking!");
+                }
+                paused = true;
+                final int pc = track.getPointCount();
+                if (track != null && pc > 0) {
+                        final TrackPoint p = track.getPoint(pc - 1);
+                        if (p.getName() == null) {
+                                p.setName("paused");
+                        }
+                }
+        }
+
+        public void continueTracking() {
+                if (state != STATE_TRACKING) {
+                        throw new IllegalStateException("Not in tracking state! Can't continue tracking!");
+                }
+                trackInterrupted = true;
+                paused = false;
+        }
+
+        public boolean isPaused() {
+                return paused;
         }
 
@@ -224 +262 @@
                 track = new Track(name);
                 state = STATE_TRACKING;
+                paused = false;
 
                 currentPointIndex = -1;

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

@@ -65 +65 @@
         private final Command stopTrackingCommand;
 
+        private final Command pauseTrackingCommand;
+
+        private final Command continueTrackingCommand;
+
         private final Command tracksCommand;
 
@@ -101 +105 @@
                 newTrackCommand = new Command("Start Track", Command.SCREEN, 2);
                 stopTrackingCommand = new Command("Stop Track", Command.STOP, 3);
-                tracksCommand = new Command("Tracks", Command.SCREEN, 4);
-                optionsCommand = new Command("Options", Command.SCREEN, 5);
-                aboutCommand = new Command("About", Command.SCREEN, 6);
+                pauseTrackingCommand = new Command("Pause Track", Command.SCREEN, 4);
+                continueTrackingCommand = new Command("Continue Track", Command.SCREEN, 4);
+                tracksCommand = new Command("Tracks", Command.SCREEN, 5);
+                optionsCommand = new Command("Options", Command.SCREEN, 6);
+                aboutCommand = new Command("About", Command.SCREEN, 7);
                 // #ifndef AVOID_FILE_API
                 exportCommand = new Command("Export Track", Command.SCREEN, 1);
@@ -149 +155 @@
         protected void setStatusMessage(final String statusMessage, final int duration) {
                 this.statusMessage = statusMessage;
-                statusMessageEndTime = System.currentTimeMillis() + duration;
-                BBTracker.getTimer().schedule(new RepaintTask(), duration + 10);
+                if (duration != -1) {
+                        statusMessageEndTime = System.currentTimeMillis() + duration;
+                        BBTracker.getTimer().schedule(new RepaintTask(), duration + 10);
+                } else {
+                        statusMessageEndTime = Long.MAX_VALUE;
+                }
                 repaint();
         }
@@ -211 +221 @@
                         setStatusMessage("Static Track");
                         removeCommand(stopTrackingCommand);
+                        removeCommand(pauseTrackingCommand);
+                        removeCommand(continueTrackingCommand);
                         removeCommand(markPointCommand);
                         // #ifndef AVOID_FILE_API
@@ -219 +231 @@
                         setStatusMessage("Tracking");
                         addCommand(stopTrackingCommand);
+                        addCommand(pauseTrackingCommand);
                         addCommand(markPointCommand);
                         // #ifndef AVOID_FILE_API
@@ -226 +239 @@
                 default:
                         removeCommand(stopTrackingCommand);
+                        removeCommand(pauseTrackingCommand);
+                        removeCommand(continueTrackingCommand);
+                        removeCommand(markPointCommand);
                         // #ifndef AVOID_FILE_API
                         removeCommand(exportCommand);
@@ -276 +292 @@
                 } else if (command == markPointCommand) {
                         markPointAction();
+                } else if (command == pauseTrackingCommand) {
+                        pauseTrackingAction();
+                } else if (command == continueTrackingCommand) {
+                        continueTrackingAction();
                 } else if (command == switchViewCommand) {
                         nextTileConfiguration();
@@ -421 +441 @@
         }
 
+        private void pauseTrackingAction() {
+                removeCommand(pauseTrackingCommand);
+                addCommand(continueTrackingCommand);
+                manager.pauseTracking();
+                setStatusMessage("Paused!", -1);
+        }
+
+        private void continueTrackingAction() {
+                removeCommand(continueTrackingCommand);
+                addCommand(pauseTrackingCommand);
+                manager.continueTracking();
+                setStatusMessage("Continuing...");
+        }
+
         protected void keyReleased(final int keyCode) {
                 final int gameAction = getGameAction(keyCode);