Changeset 93

Timestamp:

08/24/07 22:05:08 (6 years ago)

Author:

saua

Message:

Implement details screen (issue #18)

Files:

• bbtracker/trunk/src/org/bbtracker/mobile/Preferences.java (modified) (4 diffs)
• bbtracker/trunk/src/org/bbtracker/mobile/gui/DetailsTile.java (added)
• bbtracker/trunk/src/org/bbtracker/mobile/gui/MainCanvas.java (modified) (6 diffs)
• bbtracker/trunk/src/org/bbtracker/mobile/gui/OptionsForm.java (modified) (6 diffs)
• bbtracker_common/trunk/src/org/bbtracker/Track.java (modified) (1 diff)
• bbtracker_common/trunk/src/org/bbtracker/Utils.java (modified) (1 diff)

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

@@ -93 +93 @@
         private int statusFontSize = Font.SIZE_MEDIUM;
 
+        private int detailsFontSize = Font.SIZE_LARGE;
+
         private String trackDirectory;
 
@@ -182 +184 @@
         }
 
+        public int getDetailsFontSize() {
+                return detailsFontSize;
+        }
+
+        public void setDetailsFontSize(final int detailsFontSize) {
+                this.detailsFontSize = detailsFontSize;
+        }
+
         public int getNextTrackNumber() {
                 return trackNumber++;
@@ -207 +217 @@
                         final DataInputStream in = new DataInputStream(new ByteArrayInputStream(data));
 
-                        startAction = in.readShort();
-                        sampleInterval = in.readInt();
-                        trackNumber = in.readInt();
-                        if (in.readByte() != 0) {
-                                trackDirectory = in.readUTF();
-                        } else {
-                                trackDirectory = null;
-                        }
-                        exportFormats = in.readInt();
-                        units = in.readInt();
-                        statusFontSize = in.readInt();
-
-                        in.close();
+                        try {
+                                startAction = in.readShort();
+                                sampleInterval = in.readInt();
+                                trackNumber = in.readInt();
+                                if (in.readByte() != 0) {
+                                        trackDirectory = in.readUTF();
+                                } else {
+                                        trackDirectory = null;
+                                }
+                                exportFormats = in.readInt();
+                                units = in.readInt();
+                                statusFontSize = in.readInt();
+                                detailsFontSize = in.readInt();
+                        } finally {
+                                try {
+                                        in.close();
+                                } catch (final IOException ignored) {
+                                        // ignore
+                                }
+                        }
+
                 } catch (final RecordStoreNotFoundException e) {
                         // ignore, don't load anything, but show options screen
@@ -260 +278 @@
                         out.writeInt(units);
                         out.writeInt(statusFontSize);
+                        out.writeInt(detailsFontSize);
 
                         out.close();

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

@@ -52 +52 @@
         private final StatusTile statusTile;
 
+        private final Tile detailsTile;
+
         private final Command newTrackCommand;
 
@@ -79 +81 @@
                 speedProfileTile = new SpeedPlotterTile(manager, DataProvider.TIME);
                 statusTile = new StatusTile(manager);
+                detailsTile = new DetailsTile(manager);
 
                 switchViewCommand = new Command("Switch View", Command.SCREEN, 0);
@@ -94 +97 @@
                 addCommand(aboutCommand);
                 addCommand(exitCommand);
+
                 setCommandListener(this);
 
@@ -101 +105 @@
         protected void setMainTile(final Tile mainTile, final boolean withStatus) {
                 visibleTiles[0] = mainTile;
-                if (withStatus) {
+                if (withStatus == true) {
                         visibleTiles[1] = statusTile;
                 } else {
@@ -200 +204 @@
 
         private void nextTileConfiguration() {
-                tileConfiguration = (tileConfiguration + 1) % 3;
+                tileConfiguration = (tileConfiguration + 1) % 4;
                 switch (tileConfiguration) {
                 case 0:
@@ -213 +217 @@
                         setMainTile(speedProfileTile, true);
                         setStatusMessage("Speed over time");
+                        break;
+                case 3:
+                        setMainTile(detailsTile, false);
+                        setStatusMessage("Details");
                         break;
                 }

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

@@ -42 +42 @@
 
 public class OptionsForm extends Form implements CommandListener, ItemCommandListener {
+        private static final String[] FONT_SIZE_NAMES = new String[] { "Small", "Medium", "Large" };
+
         private final TrackManager trackManager;
 
@@ -61 +63 @@
 
         private final ChoiceGroup statusFontSizeGroup;
+
+        private final ChoiceGroup detailsFontSizeGroup;
 
         public OptionsForm(final TrackManager trackManager) {
@@ -75 +79 @@
                 unitsGroup.setSelectedIndex(pref.getUnits(), true);
 
-                statusFontSizeGroup = new ChoiceGroup("Status text size: ", Choice.POPUP, new String[] { "Small", "Medium",
-                                "Large" }, null);
-                int selectedFontSizeItem;
-                switch (pref.getStatusFontSize()) {
-                case Font.SIZE_SMALL:
-                        selectedFontSizeItem = 0;
-                        break;
-                case Font.SIZE_MEDIUM:
-                        selectedFontSizeItem = 1;
-                        break;
-                case Font.SIZE_LARGE:
-                        selectedFontSizeItem = 2;
-                        break;
-                default:
-                        selectedFontSizeItem = 1;
-                }
-                statusFontSizeGroup.setSelectedIndex(selectedFontSizeItem, true);
+                statusFontSizeGroup = new ChoiceGroup("Status text size: ", Choice.POPUP, FONT_SIZE_NAMES, null);
+                final int statusFontSizeIndex = getSelectedFontIndex(pref.getStatusFontSize());
+                statusFontSizeGroup.setSelectedIndex(statusFontSizeIndex, true);
+
+                detailsFontSizeGroup = new ChoiceGroup("Details text size: ", Choice.POPUP, FONT_SIZE_NAMES, null);
+                final int detailsFontSizeIndex = getSelectedFontIndex(pref.getDetailsFontSize());
+                detailsFontSizeGroup.setSelectedIndex(detailsFontSizeIndex, true);
 
                 startTypeGroup = new ChoiceGroup("Startup action: ", Choice.POPUP, Preferences.START_ACTIONS, null);
@@ -113 +107 @@
                 append(unitsGroup);
                 append(statusFontSizeGroup);
+                append(detailsFontSizeGroup);
                 append(startTypeGroup);
                 append(directoryField);
@@ -123 +118 @@
                 addCommand(cancelCommand);
                 setCommandListener(this);
+        }
+
+        private int getSelectedFontIndex(final int fontSize) {
+                int selectedIndex;
+                switch (fontSize) {
+                case Font.SIZE_SMALL:
+                        selectedIndex = 0;
+                        break;
+                case Font.SIZE_MEDIUM:
+                        selectedIndex = 1;
+                        break;
+                case Font.SIZE_LARGE:
+                        selectedIndex = 2;
+                        break;
+                default:
+                        selectedIndex = 1;
+                }
+                return selectedIndex;
+        }
+
+        private int getFontSize(final int selectedIndex) {
+                int fontSize;
+                switch (selectedIndex) {
+                case 0:
+                        fontSize = Font.SIZE_SMALL;
+                        break;
+                case 1:
+                        fontSize = Font.SIZE_MEDIUM;
+                        break;
+                case 2:
+                        fontSize = Font.SIZE_LARGE;
+                        break;
+                default:
+                        throw new IllegalStateException();
+                }
+                return fontSize;
         }
 
@@ -206 +237 @@
                         pref.setUnits(unitsGroup.getSelectedIndex());
 
-                        final int newFontSize;
-                        switch (statusFontSizeGroup.getSelectedIndex()) {
-                        case 0:
-                                newFontSize = Font.SIZE_SMALL;
-                                break;
-                        case 1:
-                                newFontSize = Font.SIZE_MEDIUM;
-                                break;
-                        case 2:
-                                newFontSize = Font.SIZE_LARGE;
-                                break;
-                        default:
-                                throw new IllegalStateException();
-                        }
-                        pref.setStatusFontSize(newFontSize);
+                        final int statusFontSize = getFontSize(statusFontSizeGroup.getSelectedIndex());
+                        pref.setStatusFontSize(statusFontSize);
+
+                        final int detailsFontSize = getFontSize(detailsFontSizeGroup.getSelectedIndex());
+                        pref.setDetailsFontSize(detailsFontSize);
 
                         pref.store();

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

@@ -96 +96 @@
         }
 
+        public long getPointOffset(final TrackPoint point) {
+                if (getPointCount() == 0) {
+                        throw new IllegalStateException("No points yet, can't calculate point offset.");
+                }
+                return point.getTimestamp() - getPoint(0).getTimestamp();
+        }
+
         public int getSegmentCount() {
                 return segments.size();

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

@@ -242 +242 @@
                 return result.toString();
         }
+
+        public static String durationToString(final long msec) {
+                // i do hope no one uses bbTracker do record tracks that
+                // are longer than Integer.MAX_VALUE seconds.
+                final StringBuffer sb = new StringBuffer(8);
+                int sec = (int) (msec / 1000);
+                if (sec > 60 * 60) {
+                        final int hours = sec / (60 * 60);
+                        sb.append(hours);
+                        sec -= hours * (60 * 60);
+                        sb.append(':');
+                }
+
+                final int minutes = sec / 60;
+                if (sb.length() > 0) {
+                        appendTwoDigits(sb, minutes, '0');
+                } else {
+                        sb.append(minutes);
+                }
+                sb.append(':');
+
+                appendTwoDigits(sb, sec, '0');
+
+                return sb.toString();
+        }
 }