X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosGraph.java;h=3f610285c80ab5d478e10e6b1b20a29f99827ae3;hb=98dc29a7a964f8d653b73989c6751695d168844c;hp=31042abb51e34ca1da41c1f0ff4df5809243280d;hpb=0da4e201041a4420f273c2e0cda77eea78099518;p=fw%2Faltos

diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java
index 31042abb..3f610285 100644
--- a/altosuilib/AltosGraph.java
+++ b/altosuilib/AltosGraph.java
@@ -80,6 +80,7 @@ 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;
 
@@ -89,15 +90,16 @@ public class AltosGraph extends AltosUIGraph {
 		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));
 	}
 }