X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosGraphNew.java;h=01603c788d1c1ec6435d54946d2869de50d8c291;hb=3f9b6d23e4e33a58c179f45ffd42211ab327d8c6;hp=a9393f9483c21cdbba1d6d93f7735604085a6f8a;hpb=222158581887b5f9e8b9843d14321c313fa023fa;p=fw%2Faltos

diff --git a/altosuilib/AltosGraphNew.java b/altosuilib/AltosGraphNew.java
index a9393f94..01603c78 100644
--- a/altosuilib/AltosGraphNew.java
+++ b/altosuilib/AltosGraphNew.java
@@ -35,7 +35,7 @@ import org.jfree.chart.labels.*;
 import org.jfree.data.xy.*;
 import org.jfree.data.*;
 
-public class AltosGraphNew extends AltosUIGraphNew {
+public class AltosGraphNew extends AltosUIGraph {
 
 	static final private Color height_color = new Color(194,31,31);
 	static final private Color kalman_height_color = new Color(255,0,0);
@@ -47,6 +47,7 @@ public class AltosGraphNew extends AltosUIGraphNew {
 	static final private Color kalman_speed_color = new Color(0,255,0);
 	static final private Color thrust_color = new Color(31,194,31);
 	static final private Color accel_color = new Color(31,31,194);
+	static final private Color vert_accel_color = new Color(64,164,164);
 	static final private Color kalman_accel_color = new Color(0,0,255);
 	static final private Color voltage_color = new Color(194, 194, 31);
 	static final private Color battery_voltage_color = new Color(194, 194, 31);
@@ -82,13 +83,17 @@ public class AltosGraphNew extends AltosUIGraphNew {
 
 	AltosUIFlightSeries flight_series;
 
-	AltosUITimeSeries[] setup(AltosFlightStats stats, AltosUIFlightSeries flight_series, AltosCalData cal_data) {
+	AltosUITimeSeries[] setup(AltosFlightStats stats, AltosUIFlightSeries flight_series) {
+		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;
 
+		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));
+
 		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);
@@ -129,6 +134,11 @@ public class AltosGraphNew extends AltosUIGraphNew {
 					    true,
 					    accel_axis);
 
+		flight_series.register_axis(AltosUIFlightSeries.vert_accel_name,
+					    vert_accel_color,
+					    true,
+					    accel_axis);
+
 		flight_series.register_axis(AltosUIFlightSeries.kalman_accel_name,
 					    kalman_accel_color,
 					    false,
@@ -159,6 +169,11 @@ public class AltosGraphNew extends AltosUIGraphNew {
 					    true,
 					    height_axis);
 
+		flight_series.register_axis(AltosUIFlightSeries.altitude_name,
+					    height_color,
+					    false,
+					    height_axis);
+
 		flight_series.register_axis(AltosUIFlightSeries.kalman_height_name,
 					    kalman_height_color,
 					    false,
@@ -305,9 +320,16 @@ public class AltosGraphNew extends AltosUIGraphNew {
 		return flight_series.series(cal_data);
 	}
 
-	public AltosGraphNew(AltosUIEnable enable, AltosFlightStats stats, AltosUIFlightSeries flight_series, AltosCalData cal_data) {
+	public void set_data(AltosFlightStats stats, AltosUIFlightSeries flight_series) {
+		set_series(setup(stats, flight_series));
+	}
+
+	public AltosGraphNew(AltosUIEnable enable) {
 		super(enable, "Flight");
+	}
 
-		set_series(setup(stats, flight_series, cal_data));
+	public AltosGraphNew(AltosUIEnable enable, AltosFlightStats stats, AltosUIFlightSeries flight_series) {
+		this(enable);
+		set_series(setup(stats, flight_series));
 	}
 }