altosui: Display current altitude in monitor idle Pad tab

[fw/altos] / altosui / AltosPad.java

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 9a8c8087037ba4ff604d400b36f3ad64c8862c1d..a29cdd6f92273b93ca9dffa909e9c946b65908ec 100644 (file)
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.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
@@ -18,8 +19,8 @@
 package altosui;
 
 import java.util.*;
-import org.altusmetrum.altoslib_10.*;
-import org.altusmetrum.altosuilib_10.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class AltosPad extends AltosUIFlightTab {
 
@@ -45,10 +46,10 @@ public class AltosPad extends AltosUIFlightTab {
 
        class LoggingReady extends AltosUIIndicator {
                public void show (AltosState state, AltosListenerState listener_state) {
-                       if (state == null || state.flight == AltosLib.MISSING) {
+                       if (state == null || state.cal_data.flight == AltosLib.MISSING) {
                                hide();
                        } else {
-                               if (state.flight != 0) {
+                               if (state.cal_data.flight != 0) {
                                        if (state.state() <= Altos.ao_flight_pad)
                                                show("Ready to record");
                                        else if (state.state() < Altos.ao_flight_landed ||
@@ -58,7 +59,7 @@ public class AltosPad extends AltosUIFlightTab {
                                                show("Recorded data");
                                } else
                                        show("Storage full");
-                               set_lights(state.flight != 0);
+                               set_lights(state.cal_data.flight != 0);
                        }
                }
                public LoggingReady (AltosUIFlightTab container, int y) {
@@ -127,10 +128,8 @@ public class AltosPad extends AltosUIFlightTab {
        }
 
        boolean report_pad(AltosState state) {
-               if ((state.state() == AltosLib.ao_flight_stateless ||
-                    state.state() < AltosLib.ao_flight_pad) &&
-                   state.gps != null &&
-                   state.gps.lat != AltosLib.MISSING)
+               if (state.state() == AltosLib.ao_flight_stateless ||
+                   state.state() < AltosLib.ao_flight_pad)
                {
                        return false;
                }
@@ -149,7 +148,7 @@ public class AltosPad extends AltosUIFlightTab {
                                if (report_pad(state)) {
                                        lat = state.pad_lat;
                                        label = "Pad Latitude";
-                               } else {
+                               } else if (state.gps != null) {
                                        lat = state.gps.lat;
                                        label = "Latitude";
                                }
@@ -186,7 +185,7 @@ public class AltosPad extends AltosUIFlightTab {
                                if (report_pad(state)) {
                                        lon = state.pad_lon;
                                        label = "Pad Longitude";
-                               } else {
+                               } else if (state.gps != null) {
                                        lon = state.gps.lon;
                                        label = "Longitude";
                                }
@@ -216,8 +215,10 @@ public class AltosPad extends AltosUIFlightTab {
                public double value(AltosState state, int i) {
                        if (report_pad(state))
                                return state.pad_alt;
-                       else
+                       else if (state.gps != null)
                                return state.gps.alt;
+                       else
+                               return state.altitude();
                }
 
                public void show (AltosState state, AltosListenerState listener_state) {