X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=9b47211dc10fd3821f167df37ab42bb4a001fe01;hb=3fa1eadb91eea001342d2d357d7aaf661e8a2a5d;hp=a3107f2bfc183362d773620ffe5bda82fc828148;hpb=222158581887b5f9e8b9843d14321c313fa023fa;p=fw%2Faltos diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index a3107f2b..9b47211d 100644 --- a/altosui/AltosGraphUI.java +++ b/altosui/AltosGraphUI.java @@ -46,17 +46,19 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt boolean any_gps = false; AltosGPSTimeValue gtv_last = null; - for (AltosGPSTimeValue gtv : flight_series.gps_series) { - gtv_last = gtv; - AltosGPS gps = gtv.gps; - if (gps != null && - gps.locked && - gps.nsat >= 4) { - if (map == null) - map = new AltosUIMap(); - map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time)); - this.gps = gps; - has_gps = true; + if (flight_series.gps_series != null) { + for (AltosGPSTimeValue gtv : flight_series.gps_series) { + gtv_last = gtv; + AltosGPS gps = gtv.gps; + if (gps != null && + gps.locked && + gps.nsat >= 4) { + if (map == null) + map = new AltosUIMap(); + map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time)); + this.gps = gps; + has_gps = true; + } } } if (gtv_last != null) { @@ -93,11 +95,11 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt set.capture_series(flight_series); - flight_series.fill_in(); + flight_series.finish(); stats = new AltosFlightStats(flight_series); - graph = new AltosGraphNew(enable, stats, flight_series, cal_data); + graph = new AltosGraphNew(enable, stats, flight_series); statsTable = new AltosFlightStatsTable(stats);