X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosPad.java;h=60f5890588cd218a00b6f34d693b060b3221c89a;hp=a29cdd6f92273b93ca9dffa909e9c946b65908ec;hb=HEAD;hpb=247fa1c669f987830540e618bf263b08284118df

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index a29cdd6f..e9bb4e41 100644
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -19,8 +19,8 @@
 package altosui;
 
 import java.util.*;
-import org.altusmetrum.altoslib_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class AltosPad extends AltosUIFlightTab {
 
@@ -46,10 +46,11 @@ public class AltosPad extends AltosUIFlightTab {
 
 	class LoggingReady extends AltosUIIndicator {
 		public void show (AltosState state, AltosListenerState listener_state) {
-			if (state == null || state.cal_data.flight == AltosLib.MISSING) {
+			AltosCalData	cal_data = state.cal_data();
+			if (state == null || cal_data.flight == AltosLib.MISSING) {
 				hide();
 			} else {
-				if (state.cal_data.flight != 0) {
+				if (cal_data.flight != 0) {
 					if (state.state() <= Altos.ao_flight_pad)
 						show("Ready to record");
 					else if (state.state() < Altos.ao_flight_landed ||
@@ -59,7 +60,7 @@ public class AltosPad extends AltosUIFlightTab {
 						show("Recorded data");
 				} else
 					show("Storage full");
-				set_lights(state.cal_data.flight != 0);
+				set_lights(cal_data.flight != 0);
 			}
 		}
 		public LoggingReady (AltosUIFlightTab container, int y) {
@@ -213,9 +214,13 @@ public class AltosPad extends AltosUIFlightTab {
 	class PadAlt extends AltosUIUnitsIndicator {
 
 		public double value(AltosState state, int i) {
-			if (report_pad(state))
-				return state.pad_alt;
-			else if (state.gps != null)
+			if (report_pad(state)) {
+				double alt = state.gps_ground_altitude();
+				if (alt == AltosLib.MISSING)
+					alt = state.ground_altitude();
+				return alt;
+			}
+			else if (state.gps != null && state.gps.alt != AltosLib.MISSING)
 				return state.gps.alt;
 			else
 				return state.altitude();