X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabDescent.java;h=698e89fc83474c26caf62492be0f89ba0f5a79f7;hb=1ec6fb3b9cec0f864d6e65d0cc6b4dd42edd3e16;hp=3805b7e77b98757a3e518deacc6cbdb18f8630c4;hpb=84d35e4cbd7ea2f681c43496b9b9db84f9dd923f;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
index 3805b7e7..698e89fc 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabDescent.java
@@ -17,8 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_1.AltosGreatCircle;
-import org.altusmetrum.altoslib_1.AltosState;
+import org.altusmetrum.altoslib_1.*;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -28,6 +27,7 @@ import android.view.View;
 import android.view.ViewGroup;
 import android.widget.ImageView;
 import android.widget.TextView;
+import android.location.Location;
 
 public class TabDescent extends Fragment implements AltosDroidTab {
 	AltosDroid mAltosDroid;
@@ -89,18 +89,26 @@ public class TabDescent extends Fragment implements AltosDroidTab {
 		mAltosDroid = null;
 	}
 
-	public void update_ui(AltosState state) {
+	public void update_ui(AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		mSpeedView.setText(String.format("%6.0f m/s", state.speed()));
 		mHeightView.setText(String.format("%6.0f m", state.height));
-		mElevationView.setText(String.format("%3.0f°", state.elevation));
-		mRangeView.setText(String.format("%6.0f m", state.range));
-		if (state.from_pad != null) {
-			mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
-			mCompassView.setText(state.from_pad.bearing_words(AltosGreatCircle.BEARING_LONG));
+		if (from_receiver != null) {
+			mElevationView.setText(String.format("%3.0f°", from_receiver.elevation));
+			mRangeView.setText(String.format("%6.0f m", from_receiver.range));
+			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+			mCompassView.setText(from_receiver.bearing_words(AltosGreatCircle.BEARING_LONG));
+			mDistanceView.setText(String.format("%6.0f m", from_receiver.distance));
+		} else { 
+			mElevationView.setText("<unknown>");
+			mRangeView.setText("<unknown>");
+			mBearingView.setText("<unknown>");
+			mCompassView.setText("<unknown>");
+			mDistanceView.setText("<unknown>");
+		}
+		if (state.gps != null) {
+			mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+			mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
 		}
-		mDistanceView.setText(String.format("%6.0f m", state.range));
-		mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-		mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
 
 		mApogeeVoltageView.setText(String.format("%4.2f V", state.drogue_sense));
 		mApogeeLights.set(state.drogue_sense > 3.2);