X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2FTeleGPSGraphUI.java;h=5d4fc9cf8be5137500ada48aaa7d0cf867876fe0;hp=3e76564020b8b492ce2b3ad6100c1befa14ec77f;hb=eaf2ee0f498b519d64e1664a2b8c66c52ac1497c;hpb=855a7d243a5a85728a7b23fdfe9485d4ecaf71cf

diff --git a/telegps/TeleGPSGraphUI.java b/telegps/TeleGPSGraphUI.java
index 3e765640..5d4fc9cf 100644
--- a/telegps/TeleGPSGraphUI.java
+++ b/telegps/TeleGPSGraphUI.java
@@ -27,17 +27,17 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
 import org.jfree.ui.RefineryUtilities;
 
-public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener
+public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, AltosUnitsListener, AltosFilterListener
 {
 	JTabbedPane		pane;
-	AltosGraphNew		graph;
+	AltosGraph		graph;
 	AltosUIEnable		enable;
 	AltosUIMap		map;
 	AltosState		state;
@@ -92,20 +92,38 @@ public class TeleGPSGraphUI extends AltosUIFrame implements AltosFontListener, A
 			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;
+	}
+
 	TeleGPSGraphUI(AltosRecordSet set, File file) throws InterruptedException, IOException {
 		super(file.getName());
 		AltosCalData cal_data = set.cal_data();
 
-		AltosUIFlightSeries flight_series = new AltosUIFlightSeries(cal_data);
+		flight_series = new AltosUIFlightSeries(cal_data);
 		set.capture_series(flight_series);
 		flight_series.finish();
 
 		pane = new JTabbedPane();
 
-		enable = new AltosUIEnable();
+		graph = new AltosGraph(enable, stats, flight_series);
+
 		stats = new AltosFlightStats(flight_series);
 
-		graph = new AltosGraphNew(enable, stats, flight_series, cal_data);
+		enable = new AltosUIEnable(this);
 
 		statsTable = new AltosFlightStatsTable(stats);