altosdroid: rename ambiguous TextView name

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

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index ba424e7915182881399516d7ec27d1759790db67..5736a4c73370907b617f7708782bea8e7e4029bf 100644 (file)
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -63,18 +63,22 @@ public class AltosDroid extends Activity {
 
        // Layout Views
        private TextView mTitle;
-       private TextView mSerialView;
+
+       // Flight state values
        private TextView mCallsignView;
        private TextView mStateView;
        private TextView mSpeedView;
        private TextView mAccelView;
        private TextView mRangeView;
-       private TextView mAltitudeView;
-       private TextView mAzimuthView;
+       private TextView mHeightView;
+       private TextView mElevationView;
        private TextView mBearingView;
        private TextView mLatitudeView;
        private TextView mLongitudeView;
 
+       // Generic field for extras at the bottom
+       private TextView mTextView;
+
        // Service
        private boolean mIsBound   = false;
        private Messenger mService = null;
@@ -108,7 +112,7 @@ public class AltosDroid extends Activity {
                                        ad.mTitle.append(str);
                                        Toast.makeText(ad.getApplicationContext(), "Connected to " + str, Toast.LENGTH_SHORT).show();
                                        //TEST!
-                                       ad.mSerialView.setText(Dumper.dump(ad.mConfigData));
+                                       ad.mTextView.setText(Dumper.dump(ad.mConfigData));
                                        break;
                                case TelemetryService.STATE_CONNECTING:
                                        ad.mTitle.setText(R.string.title_connecting);
@@ -117,14 +121,14 @@ public class AltosDroid extends Activity {
                                case TelemetryService.STATE_NONE:
                                        ad.mConfigData = null;
                                        ad.mTitle.setText(R.string.title_not_connected);
-                                       ad.mSerialView.setText("");
+                                       ad.mTextView.setText("");
                                        break;
                                }
                                break;
                        case MSG_TELEMETRY:
                                ad.update_ui((AltosState) msg.obj);
                                // TEST!
-                               ad.mSerialView.setText(Dumper.dump(msg.obj));
+                               ad.mTextView.setText(Dumper.dump(msg.obj));
                                break;
                        }
                }
@@ -179,13 +183,13 @@ public class AltosDroid extends Activity {
                double speed = state.speed;
                if (!state.ascent)
                        speed = state.baro_speed;
-               mSpeedView.setText(String.format("%6.0f", speed));
-               mAccelView.setText(String.format("%6.0f", state.acceleration));
-               mRangeView.setText(String.format("%6.0f", state.range));
-               mAltitudeView.setText(String.format("%6.0f", state.height));
-               mAzimuthView.setText(String.format("%3.0f", state.elevation));
+               mSpeedView.setText(String.format("%6.0f m/s", speed));
+               mAccelView.setText(String.format("%6.0f m/s²", state.acceleration));
+               mRangeView.setText(String.format("%6.0f m", state.range));
+               mHeightView.setText(String.format("%6.0f m", state.height));
+               mElevationView.setText(String.format("%3.0f°", state.elevation));
                if (state.from_pad != null)
-                       mBearingView.setText(String.format("%3.0f", state.from_pad.bearing));
+                       mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
                mLatitudeView.setText(pos(state.gps.lat, "N", "S"));
                mLongitudeView.setText(pos(state.gps.lon, "W", "E"));
        }
@@ -198,7 +202,7 @@ public class AltosDroid extends Activity {
                }
                int deg = (int) Math.floor(p);
                double min = (p - Math.floor(p)) * 60.0;
-               return String.format("%s %d° %9.6f", h, deg, min);
+               return String.format("%d° %9.6f\" %s", deg, min, h);
        }
 
        @Override
@@ -218,18 +222,18 @@ public class AltosDroid extends Activity {
                mTitle = (TextView) findViewById(R.id.title_right_text);
 
                // Set up the temporary Text View
-               mSerialView = (TextView) findViewById(R.id.text);
-               mSerialView.setMovementMethod(new ScrollingMovementMethod());
-               mSerialView.setClickable(false);
-               mSerialView.setLongClickable(false);
+               mTextView = (TextView) findViewById(R.id.text);
+               mTextView.setMovementMethod(new ScrollingMovementMethod());
+               mTextView.setClickable(false);
+               mTextView.setLongClickable(false);
 
                mCallsignView  = (TextView) findViewById(R.id.callsign_value);
                mStateView     = (TextView) findViewById(R.id.state_value);
                mSpeedView     = (TextView) findViewById(R.id.speed_value);
                mAccelView     = (TextView) findViewById(R.id.accel_value);
                mRangeView     = (TextView) findViewById(R.id.range_value);
-               mAltitudeView  = (TextView) findViewById(R.id.altitude_value);
-               mAzimuthView   = (TextView) findViewById(R.id.azimuth_value);
+               mHeightView    = (TextView) findViewById(R.id.height_value);
+               mElevationView = (TextView) findViewById(R.id.elevation_value);
                mBearingView   = (TextView) findViewById(R.id.bearing_value);
                mLatitudeView  = (TextView) findViewById(R.id.latitude_value);
                mLongitudeView = (TextView) findViewById(R.id.longitude_value);