altosdroid: Check for missing values

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / TabDescent.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
index 49774a3030b87eb810970f908388662a25e862a1..09e7169b229ff1c126405ac9f8fe8a3fdbedabc6 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
@@ -91,14 +91,14 @@ public class TabDescent extends Fragment implements AltosDroidTab {
 
        public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
                if (state != null) {
-                       mSpeedView.setText(String.format("%6.0f m/s", state.speed()));
-                       mHeightView.setText(String.format("%6.0f m", state.height));
+                       mSpeedView.setText(AltosDroid.number("%6.0f m/s", state.speed()));
+                       mHeightView.setText(AltosDroid.number("%6.0f m", state.height));
                        if (from_receiver != null) {
-                               mElevationView.setText(String.format("%3.0f°", from_receiver.elevation));
-                               mRangeView.setText(String.format("%6.0f m", from_receiver.range));
-                               mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+                               mElevationView.setText(AltosDroid.number("%3.0f°", from_receiver.elevation));
+                               mRangeView.setText(AltosDroid.number("%6.0f m", from_receiver.range));
+                               mBearingView.setText(AltosDroid.number("%3.0f°", from_receiver.bearing));
                                mCompassView.setText(from_receiver.bearing_words(AltosGreatCircle.BEARING_LONG));
-                               mDistanceView.setText(String.format("%6.0f m", from_receiver.distance));
+                               mDistanceView.setText(AltosDroid.number("%6.0f m", from_receiver.distance));
                        } else { 
                                mElevationView.setText("<unknown>");
                                mRangeView.setText("<unknown>");
@@ -111,11 +111,11 @@ public class TabDescent extends Fragment implements AltosDroidTab {
                                mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
                        }
 
-                       mApogeeVoltageView.setText(String.format("%4.2f V", state.drogue_sense));
-                       mApogeeLights.set(state.drogue_sense > 3.2);
+                       mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.drogue_sense));
+                       mApogeeLights.set(state.drogue_sense > 3.2, state.drogue_sense == AltosRecord.MISSING);
 
-                       mMainVoltageView.setText(String.format("%4.2f V", state.main_sense));
-                       mMainLights.set(state.main_sense > 3.2);
+                       mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_sense));
+                       mMainLights.set(state.main_sense > 3.2, state.main_sense == AltosRecord.MISSING);
                }
        }