X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabAscent.java;h=3eaf12dbd1f53ca0124794c5ebb52990d1136132;hb=b1ffdaf1f5e9b6e8ff0d4e08d8c504f8dfacd3a4;hp=de3bc3d29f5cefd8e5e16e2e643eff1017be410e;hpb=1ec6fb3b9cec0f864d6e65d0cc6b4dd42edd3e16;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
index de3bc3d2..3eaf12db 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -86,22 +86,27 @@ public class TabAscent extends Fragment implements AltosDroidTab {
 	}
 
 	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
-		mHeightView.setText(String.format("%6.0f m", state.height));
-		mMaxHeightView.setText(String.format("%6.0f m", state.max_height));
-		mSpeedView.setText(String.format("%6.0f m/s", state.speed()));
-		mMaxSpeedView.setText(String.format("%6.0f m/s", state.max_speed()));
-		mAccelView.setText(String.format("%6.0f m/s²", state.acceleration));
-		mMaxAccelView.setText(String.format("%6.0f m/s²", state.max_acceleration));
-
-		if (state.gps != null) {
-			mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-			mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+		if (state != null) {
+			mHeightView.setText(AltosDroid.number("%6.0f m", state.height()));
+			mMaxHeightView.setText(AltosDroid.number("%6.0f m", state.max_height()));
+			mSpeedView.setText(AltosDroid.number("%6.0f m/s", state.speed()));
+			mMaxSpeedView.setText(AltosDroid.number("%6.0f m/s", state.max_speed()));
+			mAccelView.setText(AltosDroid.number("%6.0f m/s²", state.acceleration()));
+			mMaxAccelView.setText(AltosDroid.number("%6.0f m/s²", state.max_acceleration()));
+
+			if (state.gps != null) {
+				mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+				mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
+			} else {
+				mLatitudeView.setText("");
+				mLongitudeView.setText("");
+			}
+
+			mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
+			mApogeeLights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING);
+
+			mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_voltage));
+			mMainLights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING);
 		}
-
-		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);
 	}
 }