altoslib: Add user-selectable filter width for data smoothing

[fw/altos] / altosuilib / AltosGraph.java

diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java
index 6f38c4172c5b92383ec3d3d60456741b43a15b7c..3f610285c80ab5d478e10e6b1b20a29f99827ae3 100644 (file)
--- 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,24 +80,26 @@ 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)
+               if (stats != null && 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));
 
                height_axis = newAxis("Height", AltosConvert.height, height_color);
                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,
@@ -330,6 +337,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));
        }
 }