summaryrefslogtreecommitdiff
path: root/altosdroid/src
diff options
context:
space:
mode:
authorMike Beattie <mike@ethernal.org>2012-08-30 13:19:41 +1200
committerMike Beattie <mike@ethernal.org>2012-08-30 13:19:41 +1200
commitc32325af6605e78c1d1147d466f3ea12ce94124a (patch)
tree948615f7f020b08f3b93f7bb7adb6ae7824d3e3f /altosdroid/src
parent8ffa4f9a474026f5a6523b26919a78565e0ed74c (diff)
altosdroid: rename azimuth/altitude to elevation/height respectively.
(Matches altoslib, altosui, altos) Signed-off-by: Mike Beattie <mike@ethernal.org>
Diffstat (limited to 'altosdroid/src')
-rw-r--r--altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java12
1 files changed, 6 insertions, 6 deletions
diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
index 9ecce681..f8e60e28 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/AltosDroid.java
@@ -69,8 +69,8 @@ public class AltosDroid extends Activity {
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;
@@ -182,8 +182,8 @@ public class AltosDroid extends Activity {
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));
- mAltitudeView.setText(String.format("%6.0f m", state.height));
- mAzimuthView.setText(String.format("%3.0f°", state.elevation));
+ 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));
mLatitudeView.setText(pos(state.gps.lat, "N", "S"));
@@ -228,8 +228,8 @@ public class AltosDroid extends Activity {
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);