Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[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 09e7169b229ff1c126405ac9f8fe8a3fdbedabc6..cc5b21833353ea0163c5c36781b41e35ade5407a 100644 (file)
--- 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_5.*;
 
 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 TabDescent extends Fragment implements AltosDroidTab {
+public class TabDescent extends AltosDroidTab {
        AltosDroid mAltosDroid;
 
        private TextView mSpeedView;
@@ -89,16 +89,18 @@ public class TabDescent extends Fragment implements AltosDroidTab {
                mAltosDroid = null;
        }
 
-       public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+       public String tab_name() { return "descent"; }
+
+       public void show(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
                if (state != null) {
-                       mSpeedView.setText(AltosDroid.number("%6.0f m/s", state.speed()));
-                       mHeightView.setText(AltosDroid.number("%6.0f m", state.height));
+                       set_value(mSpeedView, AltosConvert.speed, 6, state.speed());
+                       set_value(mHeightView, AltosConvert.height, 6, 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));
+                               set_value(mRangeView, AltosConvert.distance, 6, 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));
+                               set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
                        } else { 
                                mElevationView.setText("<unknown>");
                                mRangeView.setText("<unknown>");
@@ -108,14 +110,14 @@ public class TabDescent extends Fragment implements AltosDroidTab {
                        }
                        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"));
                        }
 
-                       mApogeeVoltageView.setText(AltosDroid.number("%4.2f V", state.drogue_sense));
-                       mApogeeLights.set(state.drogue_sense > 3.2, state.drogue_sense == AltosRecord.MISSING);
+                       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_sense));
-                       mMainLights.set(state.main_sense > 3.2, state.main_sense == AltosRecord.MISSING);
+                       mMainVoltageView.setText(AltosDroid.number("%4.2f V", state.main_voltage));
+                       mMainLights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING);
                }
        }