X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=0df92eae922da886de55e075896a6fd085f5e341;hp=2f3575a4387bbbd9e39f0e58a4a8394ce53a1f27;hb=db2443fdbf65b65703217174303027c439124a83;hpb=2120d362cefceba69e75996b6391d9558978c01d

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 2f3575a4..0df92eae 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -1,6 +1,19 @@
-
-// Copyright (c) 2010 Anthony Towns
-// GPL v2 or later
+/*
+ * Copyright © 2010 Anthony Towns
+ *
+ * This program is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; version 2 or any later version of the License.
+ *
+ * This program is distributed in the hope that it will be useful, but
+ * WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+ * General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
+ */
 
 package altosui;
 
@@ -9,37 +22,38 @@ import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
 import org.jfree.ui.RefineryUtilities;
 
-public class AltosGraphUI extends AltosUIFrame 
+public class AltosGraphUI extends AltosUIFrame
 {
 	JTabbedPane		pane;
 	AltosGraph		graph;
 	AltosUIEnable		enable;
-	AltosSiteMap		map;
+	AltosUIMap		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.gps.locked && state.gps.nsat >= 4) {
-				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 AltosUIMap();
+				map.show(state, null);
+				has_gps = true;
 			}
 		}
-		return any_gps;
 	}
 
-	AltosGraphUI(AltosRecordIterable records, File file) throws InterruptedException, IOException {
+	AltosGraphUI(AltosStateIterable states, File file) throws InterruptedException, IOException {
 		super(file.getName());
 		state = null;
 
@@ -47,20 +61,20 @@ public class AltosGraphUI extends AltosUIFrame
 
 		enable = new AltosUIEnable();
 
-		stats = new AltosFlightStats(records);
-		graphDataSet = new AltosGraphDataSet(records);
+		stats = new AltosFlightStats(states);
+		graphDataSet = new AltosGraphDataSet(states);
 
 		graph = new AltosGraph(enable, stats, graphDataSet);
 
 		statsTable = new AltosFlightStatsTable(stats);
 
-		map = new AltosSiteMap();
-
 		pane.add("Flight Graph", graph.panel);
 		pane.add("Configure Graph", enable);
 		pane.add("Flight Statistics", statsTable);
 
-		if (fill_map(records))
+		has_gps = false;
+		fill_map(states);
+		if (has_gps)
 			pane.add("Map", map);
 
 		setContentPane (pane);
@@ -69,7 +83,7 @@ public class AltosGraphUI extends AltosUIFrame
 
 		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 		setVisible(true);
-		if (state != null)
+		if (state != null && has_gps)
 			map.centre(state);
 	}
 }