X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=f387ed9bcceab91f8fda37c78a24393104537b2f;hp=f6c906c64fa78a1a14802b20d47914efcbbe7dab;hb=9a7b4f02ad32ca43a45ed9fe446b8db96e60b5e5;hpb=a61217f0a6d0ef48b6471f632c4600255867e831

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index f6c906c6..f387ed9b 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -31,7 +31,7 @@ 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;
 	AltosGraph		graph;
@@ -48,7 +48,6 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 
 		if (flight_series.gps_series != null) {
 			for (AltosGPSTimeValue gtv : flight_series.gps_series) {
-				gtv_last = gtv;
 				AltosGPS gps = gtv.gps;
 				if (gps != null &&
 				    gps.locked &&
@@ -57,6 +56,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 						map = new AltosUIMap();
 					map.show(gps, (int) flight_series.value_before(AltosFlightSeries.state_name, gtv.time));
 					this.gps = gps;
+					gtv_last = gtv;
 					has_gps = true;
 				}
 			}
@@ -82,6 +82,23 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 			enable.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();
@@ -89,9 +106,9 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 
 		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);