X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabLanded.java;h=dd3f938edd501c56454913c9e0001f37c5f0a32f;hb=0f56903774d9e8bb033dfc0af6945e8ddc1d3065;hp=a95e914557592b8de54eadd8c90067cbc1121e1d;hpb=59dfcbe14622c20aaa7d5b131eece9f4c8db6887;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
index a95e9145..dd3f938e 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabLanded.java
@@ -17,7 +17,7 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_1.AltosState;
+import org.altusmetrum.altoslib_7.*;
 
 import android.app.Activity;
 import android.os.Bundle;
@@ -26,34 +26,29 @@ import android.view.LayoutInflater;
 import android.view.View;
 import android.view.ViewGroup;
 import android.widget.TextView;
+import android.location.Location;
 
-public class TabLanded extends Fragment implements AltosDroidTab {
-	AltosDroid mAltosDroid;
-
+public class TabLanded extends AltosDroidTab {
 	private TextView mBearingView;
 	private TextView mDistanceView;
-	private TextView mLatitudeView;
-	private TextView mLongitudeView;
+	private TextView mTargetLatitudeView;
+	private TextView mTargetLongitudeView;
+	private TextView mReceiverLatitudeView;
+	private TextView mReceiverLongitudeView;
 	private TextView mMaxHeightView;
 	private TextView mMaxSpeedView;
 	private TextView mMaxAccelView;
 
-
-	@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_landed, container, false);
 
 		mBearingView   = (TextView) v.findViewById(R.id.bearing_value);
 		mDistanceView  = (TextView) v.findViewById(R.id.distance_value);
-		mLatitudeView  = (TextView) v.findViewById(R.id.lat_value);
-		mLongitudeView = (TextView) v.findViewById(R.id.lon_value);
+		mTargetLatitudeView  = (TextView) v.findViewById(R.id.target_lat_value);
+		mTargetLongitudeView = (TextView) v.findViewById(R.id.target_lon_value);
+		mReceiverLatitudeView  = (TextView) v.findViewById(R.id.receiver_lat_value);
+		mReceiverLongitudeView = (TextView) v.findViewById(R.id.receiver_lon_value);
 		mMaxHeightView = (TextView) v.findViewById(R.id.max_height_value);
 		mMaxSpeedView  = (TextView) v.findViewById(R.id.max_speed_value);
 		mMaxAccelView  = (TextView) v.findViewById(R.id.max_accel_value);
@@ -61,23 +56,27 @@ public class TabLanded extends Fragment implements AltosDroidTab {
 		return v;
 	}
 
-	@Override
-	public void onDestroy() {
-		super.onDestroy();
-		mAltosDroid.unregisterTab(this);
-		mAltosDroid = null;
-	}
+	public String tab_name() { return "landed"; }
 
-	public void update_ui(AltosState state) {
-		if (state.from_pad != null) {
-			mBearingView.setText(String.format("%3.0f°", state.from_pad.bearing));
-			mDistanceView.setText(String.format("%6.0f m", state.from_pad.distance));
+	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
+		if (from_receiver != null) {
+			mBearingView.setText(String.format("%3.0f°", from_receiver.bearing));
+			set_value(mDistanceView, AltosConvert.distance, 6, from_receiver.distance);
+		}
+		if (state != null && state.gps != null) {
+			mTargetLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
+			mTargetLongitudeView.setText(AltosDroid.pos(state.gps.lon, "E", "W"));
+		}
+
+		if (receiver != null) {
+			mReceiverLatitudeView.setText(AltosDroid.pos(receiver.getLatitude(), "N", "S"));
+			mReceiverLongitudeView.setText(AltosDroid.pos(receiver.getLongitude(), "E", "W"));
 		}
-		mLatitudeView.setText(AltosDroid.pos(state.gps.lat, "N", "S"));
-		mLongitudeView.setText(AltosDroid.pos(state.gps.lon, "W", "E"));
-		mMaxHeightView.setText(String.format("%6.0f m", state.max_height));
-		mMaxAccelView.setText(String.format("%6.0f m/s²", state.max_acceleration));
-		mMaxSpeedView.setText(String.format("%6.0f m/s", state.max_speed()));
-	}
 
+		if (state != null) {
+			set_value(mMaxHeightView, AltosConvert.height, 6, state.max_height());
+			set_value(mMaxAccelView, AltosConvert.accel, 6, state.max_acceleration());
+			set_value(mMaxSpeedView, AltosConvert.speed, 6, state.max_speed());
+		}
+	}
 }