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

[fw/altos] / altosdroid / src / org / altusmetrum / AltosDroid / TabAscent.java

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabAscent.java
index 3eaf12dbd1f53ca0124794c5ebb52990d1136132..afce937f415f3d8d88122a219c935a0c9adcc3f7 100644 (file)
--- 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_2.*;
+import org.altusmetrum.altoslib_7.*;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -29,9 +29,7 @@ import android.widget.ImageView;
 import android.widget.TextView;
 import android.location.Location;
 
-public class TabAscent extends Fragment implements AltosDroidTab {
-       AltosDroid mAltosDroid;
-
+public class TabAscent extends AltosDroidTab {
        private TextView mHeightView;
        private TextView mMaxHeightView;
        private TextView mSpeedView;
@@ -45,13 +43,6 @@ public class TabAscent extends Fragment implements AltosDroidTab {
        private TextView mMainVoltageView;
        private GoNoGoLights mMainLights;
 
-       @Override
-       public void onAttach(Activity activity) {
-               super.onAttach(activity);
-               mAltosDroid = (AltosDroid) activity;
-               mAltosDroid.registerTab(this);
-       }
-
        @Override
        public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
                View v = inflater.inflate(R.layout.tab_ascent, container, false);
@@ -78,25 +69,23 @@ public class TabAscent extends Fragment implements AltosDroidTab {
                return v;
        }
 
-       @Override
-       public void onDestroy() {
-               super.onDestroy();
-               mAltosDroid.unregisterTab(this);
-               mAltosDroid = null;
+       public String tab_name() {
+               return "ascent";
        }
 
-       public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+       public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
                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()));
+                       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("");