X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabAscent.java;h=797dc7c3ceee8b991420a7b65730b25d1d826e4e;hp=23d2e97cead2eb9d48e8000316183999a0d7f8b4;hb=cb23b992be8ba40c97d8988c134a814a13ccd58c;hpb=d5a557004c00d1ae25da04dc63c78b816562a236

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
index 23d2e97c..797dc7c3 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_7.*;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -29,7 +29,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.location.Location;
 
-public class TabAscent extends Fragment implements AltosDroidTab {
+public class TabAscent extends AltosDroidTab {
 	AltosDroid mAltosDroid;
 
 	private TextView mHeightView;
@@ -85,25 +85,33 @@ public class TabAscent extends Fragment implements AltosDroidTab {
 		mAltosDroid = null;
 	}
 
-	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+	public String tab_name() {
+		return "ascent";
+	}
+
+	public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
-			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));
+			set_value(mHeightView, AltosConvert.height, 6, state.height());
+			set_value(mHeightView, AltosConvert.height, 6, state.height());
+			set_value(mMaxHeightView, AltosConvert.height, 6, state.max_height());
+			set_value(mSpeedView, AltosConvert.speed, 6, state.speed());
+			set_value(mMaxSpeedView, AltosConvert.speed, 6, state.max_speed());
+			set_value(mAccelView, AltosConvert.accel, 6, state.acceleration());
+			set_value(mMaxAccelView, AltosConvert.accel, 6, 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"));
+				mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
+			} else {
+				mLatitudeView.setText("");
+				mLongitudeView.setText("");
 			}
 
-			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);
 		}
 	}
 }