X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabFlight.java;h=9bbdc0605dfcfcf6e9d93152ab0a823282b6a5bf;hp=e0d49a1c48c4b9329dc27ce5c7a38d393252d298;hb=9734f1198429dc8939eebf48b6e6acc1cef96485;hpb=a761b34ed8fc64435f5a49623f4a5c55e2dda33a

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
index e0d49a1c..9bbdc060 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
@@ -17,16 +17,13 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_10.*;
 
 import android.app.Activity;
 import android.os.Bundle;
 import android.support.v4.app.Fragment;
-import android.view.LayoutInflater;
-import android.view.View;
-import android.view.ViewGroup;
-import android.widget.ImageView;
-import android.widget.TextView;
+import android.view.*;
+import android.widget.*;
 import android.location.Location;
 
 public class TabFlight extends AltosDroidTab {
@@ -41,9 +38,11 @@ public class TabFlight extends AltosDroidTab {
 	private TextView distance_view;
 	private TextView latitude_view;
 	private TextView longitude_view;
+	private View apogee_view;
 	private TextView apogee_voltage_view;
 	private TextView apogee_voltage_label;
 	private GoNoGoLights apogee_lights;
+	private View main_view;
 	private TextView main_voltage_view;
 	private TextView main_voltage_label;
 	private GoNoGoLights main_lights;
@@ -64,12 +63,14 @@ public class TabFlight extends AltosDroidTab {
 		latitude_view  = (TextView) v.findViewById(R.id.lat_value);
 		longitude_view = (TextView) v.findViewById(R.id.lon_value);
 
+		apogee_view = v.findViewById(R.id.apogee_view);
 		apogee_voltage_view = (TextView) v.findViewById(R.id.apogee_voltage_value);
 		apogee_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.apogee_redled),
 		                                 (ImageView) v.findViewById(R.id.apogee_greenled),
 		                                 getResources());
 		apogee_voltage_label = (TextView) v.findViewById(R.id.apogee_voltage_label);
 
+		main_view = v.findViewById(R.id.main_view);
 		main_voltage_view = (TextView) v.findViewById(R.id.main_voltage_value);
 		main_lights = new GoNoGoLights((ImageView) v.findViewById(R.id.main_redled),
 		                               (ImageView) v.findViewById(R.id.main_greenled),
@@ -86,7 +87,7 @@ public class TabFlight extends AltosDroidTab {
 			set_value(speed_view, AltosConvert.speed, 6, state.speed());
 			set_value(height_view, AltosConvert.height, 6, state.height());
 			set_value(max_speed_view, AltosConvert.speed, 6, state.max_speed());
-			set_value(max_height_view, AltosConvert.speed, 6, state.max_height());
+			set_value(max_height_view, AltosConvert.height, 6, state.max_height());
 			if (from_receiver != null) {
 				elevation_view.setText(AltosDroid.number("%3.0f°", from_receiver.elevation));
 				set_value(range_view, AltosConvert.distance, 6, from_receiver.range);
@@ -106,27 +107,19 @@ public class TabFlight extends AltosDroidTab {
 			}
 
 			if (state.apogee_voltage == AltosLib.MISSING) {
-				apogee_voltage_view.setVisibility(View.GONE);
-				apogee_voltage_label.setVisibility(View.GONE);
-				apogee_lights.hide();
+				apogee_view.setVisibility(View.GONE);
 			} else {
 				apogee_voltage_view.setText(AltosDroid.number("%4.2f V", state.apogee_voltage));
-				apogee_voltage_view.setVisibility(View.VISIBLE);
-				apogee_voltage_label.setVisibility(View.VISIBLE);
 				apogee_lights.set(state.apogee_voltage > 3.2, state.apogee_voltage == AltosLib.MISSING);
-				apogee_lights.show();
+				apogee_view.setVisibility(View.VISIBLE);
 			}
 
 			if (state.main_voltage == AltosLib.MISSING) {
-				main_voltage_view.setVisibility(View.GONE);
-				main_voltage_label.setVisibility(View.GONE);
-				main_lights.hide();
+				main_view.setVisibility(View.GONE);
 			} else {
 				main_voltage_view.setText(AltosDroid.number("%4.2f V", state.main_voltage));
-				main_voltage_view.setVisibility(View.VISIBLE);
-				main_voltage_label.setVisibility(View.VISIBLE);
 				main_lights.set(state.main_voltage > 3.2, state.main_voltage == AltosLib.MISSING);
-				main_lights.show();
+				main_view.setVisibility(View.VISIBLE);
 			}
 		}
 	}