X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosdroid%2Fsrc%2Forg%2Faltusmetrum%2FAltosDroid%2FTabFlight.java;h=5349612cc1ec823a602a619dfe07766bc4923b9f;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hp=e1fc737d07126ac7cbf3e043d42bcebd713b3d5e;hpb=2b6768ed32d7be444c49caa40d30b520177bb22a;p=fw%2Faltos

diff --git a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
index e1fc737d..5349612c 100644
--- a/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
+++ b/altosdroid/src/org/altusmetrum/AltosDroid/TabFlight.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -17,16 +18,13 @@
 
 package org.altusmetrum.AltosDroid;
 
-import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altoslib_12.*;
 
 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 +39,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 +64,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),
@@ -79,14 +81,14 @@ public class TabFlight extends AltosDroidTab {
 		return v;
 	}
 
-	public String tab_name() { return "flight"; }
+	public String tab_name() { return AltosDroid.tab_flight_name; }
 
 	public void show(TelemetryState telem_state, AltosState state, AltosGreatCircle from_receiver, Location receiver) {
 		if (state != null) {
 			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 +108,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);
 			}
 		}
 	}