X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=c42f7b5f89d4f346517fad948c5b3ec6a86229d4;hp=ac20f84b26a23ad7bfc4b22b6374348829778318;hb=36197a388a9ba1d1ee4acd96ac0079ad3af9d3d0;hpb=cbd9dd989a662f41ddcb0c9e0f4453840687fd4a

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index ac20f84b..c42f7b5f 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -9,7 +9,7 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_2.*;
 import org.altusmetrum.altosuilib_1.*;
 
 import org.jfree.chart.ChartPanel;
@@ -23,39 +23,45 @@ public class AltosGraphUI extends AltosUIFrame
 	AltosUIEnable		enable;
 	AltosSiteMap		map;
 	AltosState		state;
+	AltosGraphDataSet	graphDataSet;
+	AltosFlightStats	stats;
+	AltosFlightStatsTable	statsTable;
+	boolean			has_gps;
 
-	boolean fill_map(AltosRecordIterable records) {
+	void fill_map(AltosStateIterable states) {
 		boolean		any_gps = false;
-		for (AltosRecord record : records) {
-			state = new AltosState(record, state);
-			if (state.data.gps != null) {
-				map.show(state, 0);
-				any_gps = true;
+		for (AltosState state : states) {
+			if (state.gps != null && state.gps.locked && state.gps.nsat >= 4) {
+				if (map == null)
+					map = new AltosSiteMap();
+				map.show(state, null);
+				has_gps = true;
 			}
 		}
-		return any_gps;
 	}
 
-	AltosGraphUI(AltosRecordIterable records, String file) throws InterruptedException, IOException {
+	AltosGraphUI(AltosStateIterable states, File file) throws InterruptedException, IOException {
+		super(file.getName());
 		state = null;
 
 		pane = new JTabbedPane();
 
 		enable = new AltosUIEnable();
 
-		AltosGraph graph = new AltosGraph(enable);
+		stats = new AltosFlightStats(states);
+		graphDataSet = new AltosGraphDataSet(states);
 
-		graph.setDataSet(new AltosGraphDataSet(records));
+		graph = new AltosGraph(enable, stats, graphDataSet);
 
-		map = new AltosSiteMap();
+		statsTable = new AltosFlightStatsTable(stats);
 
 		pane.add("Flight Graph", graph.panel);
 		pane.add("Configure Graph", enable);
+		pane.add("Flight Statistics", statsTable);
 
-		AltosFlightStatsTable stats = new AltosFlightStatsTable(new AltosFlightStats(records));
-		pane.add("Flight Statistics", stats);
-
-		if (fill_map(records))
+		has_gps = false;
+		fill_map(states);
+		if (has_gps)
 			pane.add("Map", map);
 
 		setContentPane (pane);
@@ -64,7 +70,7 @@ public class AltosGraphUI extends AltosUIFrame
 
 		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 		setVisible(true);
-		if (state != null)
+		if (state != null && has_gps)
 			map.centre(state);
 	}
 }