X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosui%2FAltosGraphUI.java;h=9b47211dc10fd3821f167df37ab42bb4a001fe01;hb=9e17d3be199d14473d8a7f9b899c290518b879a6;hp=5314a3b6fb025e837593fc7b6653c3eac8683db5;hpb=4d497c1be534e2b206edec3c096198c8ea64cebe;p=fw%2Faltos

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 5314a3b6..9b47211d 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -44,19 +44,28 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 
 	void fill_map(AltosFlightSeries flight_series) {
 		boolean			any_gps = false;
-
-		for (AltosGPSTimeValue gtv : flight_series.gps_series) {
-			AltosGPS gps = gtv.gps;
-			if (gps != null &&
-			    gps.locked &&
-			    gps.nsat >= 4) {
-				if (map == null)
-					map = new AltosUIMap();
-				map.show(gps, AltosLib.ao_flight_pad);
-				this.gps = gps;
-				has_gps = true;
+		AltosGPSTimeValue	gtv_last = null;
+
+		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) {
+			int state = (int) flight_series.value_after(AltosFlightSeries.state_name, gtv_last.time);
+			if (state == AltosLib.ao_flight_landed)
+				map.show(gtv_last.gps, state);
+		}
 	}
 
 	public void font_size_changed(int font_size) {
@@ -86,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);