X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabDescent.java;h=e4a954ca1603e7fc38d9ffd46558fe597463f082;hp=49774a3030b87eb810970f908388662a25e862a1;hb=b1ffdaf1f5e9b6e8ff0d4e08d8c504f8dfacd3a4;hpb=6592a5be127a9c95d3b2e7d5aa6ffba71c6748b9

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
index 49774a30..e4a954ca 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.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;
@@ -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.apogee_voltage));
+			mApogeeLights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.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_voltage));
+			mMainLights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING);
 		}
 	}