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

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index db0cac2f..8f52728b 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -24,45 +24,53 @@ import java.util.ArrayList;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
 import org.jfree.ui.RefineryUtilities;
 
-public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
+public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener, AltosFilterListener
 {
 	JTabbedPane		pane;
-	AltosGraphNew		graph;
+	AltosGraph		graph;
 	AltosUIEnable		enable;
 	AltosUIMap		map;
 	AltosFlightStats	stats;
 	AltosFlightStatsTable	statsTable;
+	AltosFlightConfigTable	configTable;
+	AltosFlightPyroTable	pyroTable;
 	AltosGPS		gps;
 	boolean			has_gps;
 
 	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(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
-				this.gps = gps;
-				has_gps = true;
+		double gps_pad_altitude = flight_series.cal_data().gps_pad_altitude;;
+
+		if (flight_series.gps_series != null) {
+			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();
+					double gps_height = gps.alt - gps_pad_altitude;
+					int state = (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time);
+					map.show(gps, gtv.time, state, gps_height);
+					this.gps = gps;
+					gtv_last = gtv;
+					has_gps = true;
+				}
 			}
 		}
 		if (gtv_last != null) {
 			int state = (int) flight_series.value_after(AltosFlightSeries.state_name, gtv_last.time);
+			double gps_height = gps.alt - gps_pad_altitude;
 			if (state == AltosLib.ao_flight_landed)
-				map.show(gtv_last.gps, state);
+				map.show(gtv_last.gps, gtv_last.time, state,gps_height);
 		}
 	}
 
@@ -71,6 +79,10 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 			map.font_size_changed(font_size);
 		if (statsTable != null)
 			statsTable.font_size_changed(font_size);
+		if (configTable != null)
+			configTable.font_size_changed(font_size);
+		if (pyroTable != null)
+			pyroTable.font_size_changed(font_size);
 	}
 
 	public void units_changed(boolean imperial_units) {
@@ -78,18 +90,39 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 			map.units_changed(imperial_units);
 		if (enable != null)
 			enable.units_changed(imperial_units);
+		if (configTable != null)
+			configTable.units_changed(imperial_units);
+		if (pyroTable != null)
+			pyroTable.units_changed(imperial_units);
+	}
+
+	AltosUIFlightSeries flight_series;
+
+	public void filter_changed(double speed_filter, double accel_filter) {
+		flight_series.set_filter(speed_filter, accel_filter);
+		graph.filter_changed();
+		stats = new AltosFlightStats(flight_series);
+		statsTable.filter_changed(stats);
+	}
+
+	public double speed_filter() {
+		return flight_series.speed_filter_width;
+	}
+
+	public double accel_filter() {
+		return flight_series.accel_filter_width;
 	}
 
 	AltosGraphUI(AltosRecordSet set, File file) throws InterruptedException, IOException {
 		super(file.getName());
 		AltosCalData	cal_data = set.cal_data();
-
+		AltosConfigData	config_data = set.config_data();
 
 		pane = new JTabbedPane();
 
-		enable = new AltosUIEnable();
+		flight_series = new AltosUIFlightSeries(cal_data);
 
-		AltosUIFlightSeries flight_series = new AltosUIFlightSeries(cal_data);
+		enable = new AltosUIEnable(this);
 
 		set.capture_series(flight_series);
 
@@ -97,13 +130,21 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 
 		stats = new AltosFlightStats(flight_series);
 
-		graph = new AltosGraphNew(enable, stats, flight_series, cal_data);
+		graph = new AltosGraph(enable, stats, flight_series);
 
 		statsTable = new AltosFlightStatsTable(stats);
 
 		pane.add("Flight Graph", graph.panel);
 		pane.add("Configure Graph", enable);
 		pane.add("Flight Statistics", statsTable);
+		if (config_data != null) {
+			configTable = new AltosFlightConfigTable(config_data);
+			pane.add("Configuration", configTable);
+			if (config_data.npyro > 0) {
+				pyroTable = new AltosFlightPyroTable(config_data.pyros, config_data.npyro);
+				pane.add("Pyros", pyroTable);
+			}
+		}
 
 		has_gps = false;
 		fill_map(flight_series);