X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosFlightStatsTable.java;h=f8a2d4de2374b76048c46f095fb49e22459c6286;hb=7ec1b97d278c7aec3199fb7270f0dcf9484c879f;hp=5ed53c1a8a716786fba14abbe6ab7b407f3d1054;hpb=cbd9dd989a662f41ddcb0c9e0f4453840687fd4a;p=fw%2Faltos

diff --git a/altosui/AltosFlightStatsTable.java b/altosui/AltosFlightStatsTable.java
index 5ed53c1a..f8a2d4de 100644
--- a/altosui/AltosFlightStatsTable.java
+++ b/altosui/AltosFlightStatsTable.java
@@ -106,11 +106,11 @@ public class AltosFlightStatsTable extends JComponent {
 				       String.format("%5.0f G", AltosConvert.meters_to_g(stats.state_accel[Altos.ao_flight_boost])));
 		}
 		new FlightStat(layout, y++, "Drogue descent rate",
-			       String.format("%5.0f m/s", stats.state_baro_speed[Altos.ao_flight_drogue]),
-			       String.format("%5.0f ft/s", AltosConvert.meters_to_feet(stats.state_baro_speed[Altos.ao_flight_drogue])));
+			       String.format("%5.0f m/s", stats.state_speed[Altos.ao_flight_drogue]),
+			       String.format("%5.0f ft/s", AltosConvert.meters_to_feet(stats.state_speed[Altos.ao_flight_drogue])));
 		new FlightStat(layout, y++, "Main descent rate",
-			       String.format("%5.0f m/s", stats.state_baro_speed[Altos.ao_flight_main]),
-			       String.format("%5.0f ft/s", AltosConvert.meters_to_feet(stats.state_baro_speed[Altos.ao_flight_main])));
+			       String.format("%5.0f m/s", stats.state_speed[Altos.ao_flight_main]),
+			       String.format("%5.0f ft/s", AltosConvert.meters_to_feet(stats.state_speed[Altos.ao_flight_main])));
 		new FlightStat(layout, y++, "Ascent time",
 			       String.format("%6.1f s %s", stats.state_end[AltosLib.ao_flight_boost] - stats.state_start[AltosLib.ao_flight_boost],
 					     AltosLib.state_name(Altos.ao_flight_boost)),
@@ -126,7 +126,7 @@ public class AltosFlightStatsTable extends JComponent {
 		new FlightStat(layout, y++, "Flight time",
 			       String.format("%6.1f s", stats.state_end[Altos.ao_flight_main] -
 					     stats.state_start[Altos.ao_flight_boost]));
-		if (stats.lat != -1 && stats.lon != -1) {
+		if (stats.has_gps) {
 			new FlightStat(layout, y++, "Pad location",
 				       pos(stats.pad_lat,"N","S"),
 				       pos(stats.pad_lon,"E","W"));