X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosGraph.java;h=5df952330168cf2de197c60fed46887a1497d5cd;hb=d75e8b9046295051c91696461e8d5f59c8260ccc;hp=6f38c4172c5b92383ec3d3d60456741b43a15b7c;hpb=e2fe220efe2ba375ddd925747a630c30c17d3bef;p=fw%2Faltos

diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java
index 6f38c417..5df95233 100644
--- a/altosuilib/AltosGraph.java
+++ b/altosuilib/AltosGraph.java
@@ -16,14 +16,14 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altosuilib_11;
+package org.altusmetrum.altosuilib_12;
 
 import java.io.*;
 import java.util.ArrayList;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altoslib_12.*;
 
 import org.jfree.ui.*;
 import org.jfree.chart.*;
@@ -80,16 +80,17 @@ public class AltosGraph extends AltosUIGraph {
 	static final private Color orient_color = new Color(31, 31, 31);
 
 	static AltosUnits dop_units = null;
+	static AltosUnits tick_units = null;
 
 	AltosUIFlightSeries flight_series;
 
 	AltosUITimeSeries[] setup(AltosFlightStats stats, AltosUIFlightSeries flight_series) {
-		AltosCalData	cal_data = flight_series.cal_data;
+		AltosCalData	cal_data = flight_series.cal_data();
 
 		AltosUIAxis	height_axis, speed_axis, accel_axis, voltage_axis, temperature_axis, nsat_axis, dbm_axis;
 		AltosUIAxis	distance_axis, pressure_axis, thrust_axis;
 		AltosUIAxis	gyro_axis, orient_axis, mag_axis;
-		AltosUIAxis	course_axis, dop_axis;
+		AltosUIAxis	course_axis, dop_axis, tick_axis;
 
 		if (stats.serial != AltosLib.MISSING && stats.product != null && stats.flight != AltosLib.MISSING)
 			setName(String.format("%s %d flight %d\n", stats.product, stats.serial, stats.flight));
@@ -98,6 +99,7 @@ public class AltosGraph extends AltosUIGraph {
 		pressure_axis = newAxis("Pressure", AltosConvert.pressure, pressure_color, 0);
 		speed_axis = newAxis("Speed", AltosConvert.speed, speed_color);
 		thrust_axis = newAxis("Thrust", AltosConvert.force, thrust_color);
+		tick_axis = newAxis("Tick", tick_units, accel_color, 0);
 		accel_axis = newAxis("Acceleration", AltosConvert.accel, accel_color);
 		voltage_axis = newAxis("Voltage", AltosConvert.voltage, voltage_color);
 		temperature_axis = newAxis("Temperature", AltosConvert.temperature, temperature_color, 0);
@@ -129,6 +131,11 @@ public class AltosGraph extends AltosUIGraph {
 					      plot,
 					      false);
 
+		flight_series.register_axis(AltosUIFlightSeries.tick_name,
+					    accel_color,
+					    false,
+					    tick_axis);
+
 		flight_series.register_axis(AltosUIFlightSeries.accel_name,
 					    accel_color,
 					    true,
@@ -320,6 +327,12 @@ public class AltosGraph extends AltosUIGraph {
 		return flight_series.series(cal_data);
 	}
 
+	public void set_filter(double filter) {
+		System.out.printf("filter set to %f\n", filter);
+		flight_series.set_filter(filter, filter);
+		units_changed(false);
+	}
+
 	public void set_data(AltosFlightStats stats, AltosUIFlightSeries flight_series) {
 		set_series(setup(stats, flight_series));
 	}
@@ -330,6 +343,7 @@ public class AltosGraph extends AltosUIGraph {
 
 	public AltosGraph(AltosUIEnable enable, AltosFlightStats stats, AltosUIFlightSeries flight_series) {
 		this(enable);
+		this.flight_series = flight_series;
 		set_series(setup(stats, flight_series));
 	}
 }