X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosPad.java;h=60f5890588cd218a00b6f34d693b060b3221c89a;hp=0aeef8e159cd92bf79c3826f5f445c162deca8e7;hb=HEAD;hpb=0da4e201041a4420f273c2e0cda77eea78099518 diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java index 0aeef8e1..e9bb4e41 100644 --- a/altosui/AltosPad.java +++ b/altosui/AltosPad.java @@ -19,8 +19,8 @@ package altosui; import java.util.*; -import org.altusmetrum.altoslib_12.*; -import org.altusmetrum.altosuilib_12.*; +import org.altusmetrum.altoslib_14.*; +import org.altusmetrum.altosuilib_14.*; public class AltosPad extends AltosUIFlightTab { @@ -214,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();