X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=db0cac2ffe178b60c58cfd27595893f23d49385a;hp=50a1948ececfb4d107c8eb37ef41fc7b570f4f63;hb=fd738d47bbc46d36698350d5450abe1125d990a3;hpb=bbe0c2e0a3216f40f49af34b756330ba28d7c7e1

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 50a1948e..db0cac2f 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -37,22 +37,33 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 	AltosGraphNew		graph;
 	AltosUIEnable		enable;
 	AltosUIMap		map;
-	AltosState		state;
-	AltosGraphDataSet	graphDataSet;
 	AltosFlightStats	stats;
 	AltosFlightStatsTable	statsTable;
+	AltosGPS		gps;
 	boolean			has_gps;
 
-	void fill_map(AltosStateIterable states) {
-		boolean		any_gps = false;
-		for (AltosState state : states) {
-			if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
+	void fill_map(AltosFlightSeries flight_series) {
+		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(state, null);
+				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) {
@@ -69,18 +80,24 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 			enable.units_changed(imperial_units);
 	}
 
-	AltosGraphUI(AltosStateIterable states, AltosRecordSet record_set, File file) throws InterruptedException, IOException {
+	AltosGraphUI(AltosRecordSet set, File file) throws InterruptedException, IOException {
 		super(file.getName());
-		state = null;
+		AltosCalData	cal_data = set.cal_data();
+
 
 		pane = new JTabbedPane();
 
 		enable = new AltosUIEnable();
 
-		stats = new AltosFlightStats(states);
-//		graphDataSet = new AltosGraphDataSet(states);
+		AltosUIFlightSeries flight_series = new AltosUIFlightSeries(cal_data);
+
+		set.capture_series(flight_series);
+
+		flight_series.finish();
+
+		stats = new AltosFlightStats(flight_series);
 
-		graph = new AltosGraphNew(enable, stats, record_set);
+		graph = new AltosGraphNew(enable, stats, flight_series, cal_data);
 
 		statsTable = new AltosFlightStatsTable(stats);
 
@@ -89,7 +106,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 		pane.add("Flight Statistics", statsTable);
 
 		has_gps = false;
-		fill_map(states);
+		fill_map(flight_series);
 		if (has_gps)
 			pane.add("Map", map);
 
@@ -108,7 +125,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 		pack();
 
 		setVisible(true);
-		if (state != null && has_gps)
-			map.centre(state);
+		if (gps != null)
+			map.centre(gps);
 	}
 }