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

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index 2f3575a4..5314a3b6 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -1,6 +1,20 @@
-
-// 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; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * 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;
 
@@ -8,68 +22,103 @@ import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
+import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 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 implements AltosFontListener, AltosUnitsListener
 {
 	JTabbedPane		pane;
-	AltosGraph		graph;
+	AltosGraphNew		graph;
 	AltosUIEnable		enable;
-	AltosSiteMap		map;
-	AltosState		state;
-	AltosGraphDataSet	graphDataSet;
+	AltosUIMap		map;
 	AltosFlightStats	stats;
 	AltosFlightStatsTable	statsTable;
-
-	boolean fill_map(AltosRecordIterable records) {
-		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;
+	AltosGPS		gps;
+	boolean			has_gps;
+
+	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;
 			}
 		}
-		return any_gps;
 	}
 
-	AltosGraphUI(AltosRecordIterable records, File file) throws InterruptedException, IOException {
+	public void font_size_changed(int font_size) {
+		if (map != null)
+			map.font_size_changed(font_size);
+		if (statsTable != null)
+			statsTable.font_size_changed(font_size);
+	}
+
+	public void units_changed(boolean imperial_units) {
+		if (map != null)
+			map.units_changed(imperial_units);
+		if (enable != null)
+			enable.units_changed(imperial_units);
+	}
+
+	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(records);
-		graphDataSet = new AltosGraphDataSet(records);
+		AltosUIFlightSeries flight_series = new AltosUIFlightSeries(cal_data);
 
-		graph = new AltosGraph(enable, stats, graphDataSet);
+		set.capture_series(flight_series);
 
-		statsTable = new AltosFlightStatsTable(stats);
+		flight_series.fill_in();
+
+		stats = new AltosFlightStats(flight_series);
 
-		map = new AltosSiteMap();
+		graph = new AltosGraphNew(enable, stats, flight_series, cal_data);
+
+		statsTable = new AltosFlightStatsTable(stats);
 
 		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(flight_series);
+		if (has_gps)
 			pane.add("Map", map);
 
 		setContentPane (pane);
 
+		AltosUIPreferences.register_font_listener(this);
+		AltosPreferences.register_units_listener(this);
+
+		addWindowListener(new WindowAdapter() {
+				@Override
+				public void windowClosing(WindowEvent e) {
+					AltosUIPreferences.unregister_font_listener(AltosGraphUI.this);
+					AltosPreferences.unregister_units_listener(AltosGraphUI.this);
+				}
+			});
 		pack();
 
-		setDefaultCloseOperation(DISPOSE_ON_CLOSE);
 		setVisible(true);
-		if (state != null)
-			map.centre(state);
+		if (gps != null)
+			map.centre(gps);
 	}
 }