X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fapp%2Fsrc%2Fmain%2Fjava%2Forg%2Faltusmetrum%2FAltosDroid%2FTabFlight.java;h=0346f71c42ad99b073a1af457ba5269fe60ff574;hb=b140da92536d7c48ba37868f1c2afce7bb86dfdb;hp=ba45c47eff202c4ab185b9798e91ff7a11f573c1;hpb=528fdc4e03466430c8d81fc78c90d3c9e8465ca7;p=fw%2Faltos

diff --git a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java
index ba45c47e..0346f71c 100644
--- a/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java
+++ b/altosdroid/app/src/main/java/org/altusmetrum/AltosDroid/TabFlight.java
@@ -28,8 +28,12 @@ import android.location.Location;
 public class TabFlight extends AltosDroidTab {
 	private TextView speed_view;
 	private TextView height_view;
+	private TextView altitude_view;
+	private View tilt_view;
+	private TextView tilt_value;
 	private TextView max_speed_view;
 	private TextView max_height_view;
+	private TextView max_altitude_view;
 	private TextView elevation_view;
 	private TextView range_view;
 	private TextView bearing_view;
@@ -50,10 +54,14 @@ public class TabFlight extends AltosDroidTab {
 	public View onCreateView(LayoutInflater inflater, ViewGroup container, Bundle savedInstanceState) {
 		View v = inflater.inflate(R.layout.tab_flight, container, false);
 
-		speed_view     = (TextView) v.findViewById(R.id.speed_value);
-		height_view    = (TextView) v.findViewById(R.id.height_value);
-		max_speed_view = (TextView) v.findViewById(R.id.max_speed_value);
-		max_height_view= (TextView) v.findViewById(R.id.max_height_value);
+		speed_view      = (TextView) v.findViewById(R.id.speed_value);
+		height_view     = (TextView) v.findViewById(R.id.height_value);
+		altitude_view   = (TextView) v.findViewById(R.id.altitude_value);
+		tilt_view 	= (View) v.findViewById(R.id.tilt_view);
+		tilt_value 	= (TextView) v.findViewById(R.id.tilt_value);
+		max_speed_view  = (TextView) v.findViewById(R.id.max_speed_value);
+		max_height_view = (TextView) v.findViewById(R.id.max_height_value);
+		max_altitude_view= (TextView) v.findViewById(R.id.max_altitude_value);
 		elevation_view = (TextView) v.findViewById(R.id.elevation_value);
 		range_view     = (TextView) v.findViewById(R.id.range_value);
 		bearing_view   = (TextView) v.findViewById(R.id.bearing_value);
@@ -85,8 +93,17 @@ public class TabFlight extends AltosDroidTab {
 		if (state != null) {
 			set_value(speed_view, AltosConvert.speed, 1, state.speed());
 			set_value(height_view, AltosConvert.height, 1, state.height());
+			set_value(altitude_view, AltosConvert.height, 1, state.altitude());
+			double orient = state.orient();
+			if (orient == AltosLib.MISSING) {
+				tilt_view.setVisibility(View.GONE);
+			} else {
+				tilt_value.setText(AltosDroid.number("%1.0f°", orient));
+				tilt_view.setVisibility(View.VISIBLE);
+			}
 			set_value(max_speed_view, AltosConvert.speed, 1, state.max_speed());
 			set_value(max_height_view, AltosConvert.height, 1, state.max_height());
+			set_value(max_altitude_view, AltosConvert.height, 1, state.max_altitude());
 			if (from_receiver != null) {
 				elevation_view.setText(AltosDroid.number("%1.0f°", from_receiver.elevation));
 				set_value(range_view, AltosConvert.distance, 1, from_receiver.range);