From: Keith Packard Date: Sat, 25 Jan 2014 06:40:49 +0000 (-0800) Subject: altosui: Show GPS max height in flight stats window of graph X-Git-Tag: 1.3.2~31 X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=ea8c9ca9dd24a026ea5bfe5a1ac70857181a88c8;hp=e4616233f3942d2796ba6633477670a83669957b altosui: Show GPS max height in flight stats window of graph Uses the new state.max_gps_height() function.# Signed-off-by: Keith Packard --- diff --git a/altosui/AltosFlightStats.java b/altosui/AltosFlightStats.java index bf5644c3..0be49c2f 100644 --- a/altosui/AltosFlightStats.java +++ b/altosui/AltosFlightStats.java @@ -22,6 +22,7 @@ import org.altusmetrum.altoslib_3.*; public class AltosFlightStats { double max_height; + double max_gps_height; double max_speed; double max_acceleration; double[] state_speed = new double[Altos.ao_flight_invalid + 1]; @@ -153,6 +154,7 @@ public class AltosFlightStats { max_height = state.max_height(); max_speed = state.max_speed(); max_acceleration = state.max_acceleration(); + max_gps_height = state.max_gps_height(); } if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) { if (state_id <= Altos.ao_flight_pad) { diff --git a/altosui/AltosFlightStatsTable.java b/altosui/AltosFlightStatsTable.java index 3e7e9fe1..cb0c1562 100644 --- a/altosui/AltosFlightStatsTable.java +++ b/altosui/AltosFlightStatsTable.java @@ -91,6 +91,11 @@ public class AltosFlightStatsTable extends JComponent { new FlightStat(layout, y++, "Maximum height", String.format("%5.0f m", stats.max_height), String.format("%5.0f ft", AltosConvert.meters_to_feet(stats.max_height))); + if (stats.max_gps_height != AltosLib.MISSING) { + new FlightStat(layout, y++, "Maximum GPS height", + String.format("%5.0f m", stats.max_gps_height), + String.format("%5.0f ft", AltosConvert.meters_to_feet(stats.max_gps_height))); + } new FlightStat(layout, y++, "Maximum speed", String.format("%5.0f m/s", stats.max_speed), String.format("%5.0f mph", AltosConvert.meters_to_mph(stats.max_speed)),