X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabDescent.java;h=09e7169b229ff1c126405ac9f8fe8a3fdbedabc6;hb=156e60954fae15bc090984f79cd5594f910ca913;hp=698e89fc83474c26caf62492be0f89ba0f5a79f7;hpb=2f7015afcca7c6042365d2124d3a5b7219e8e588;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
index 698e89fc..09e7169b 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
@@ -90,31 +90,33 @@ public class TabDescent extends Fragment implements AltosDroidTab {
 	}
 
 	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
-		mSpeedView.setText(String.format("%6.0f m/s", state.speed()));
-		mHeightView.setText(String.format("%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));
-			mCompassView.setText(from_receiver.bearing_words(AltosGreatCircle.BEARING_LONG));
-			mDistanceView.setText(String.format("%6.0f m", from_receiver.distance));
-		} else { 
-			mElevationView.setText("<unknown>");
-			mRangeView.setText("<unknown>");
-			mBearingView.setText("<unknown>");
-			mCompassView.setText("<unknown>");
-			mDistanceView.setText("<unknown>");
+		if (state != null) {
+			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(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(AltosDroid.number("%6.0f m", from_receiver.distance));
+			} else { 
+				mElevationView.setText("<unknown>");
+				mRangeView.setText("<unknown>");
+				mBearingView.setText("<unknown>");
+				mCompassView.setText("<unknown>");
+				mDistanceView.setText("<unknown>");
+			}
+			if (state.gps != null) {
+				mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+				mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+			}
+
+			mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.drogue_sense));
+			mApogeeLights.set(state.drogue_sense > 3.2, state.drogue_sense == AltosRecord.MISSING);
+
+			mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_sense));
+			mMainLights.set(state.main_sense > 3.2, state.main_sense == AltosRecord.MISSING);
 		}
-		if (state.gps != null) {
-			mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-			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);
-
-		mMainVoltageView.setText(String.format("%4.2f V", state.main_sense));
-		mMainLights.set(state.main_sense > 3.2);
 	}
 
 }