X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosGraphNew.java;h=01603c788d1c1ec6435d54946d2869de50d8c291;hb=3f9b6d23e4e33a58c179f45ffd42211ab327d8c6;hp=08a3373087fb95d22081e9aa3fbab7c59410c646;hpb=9748d267b80e42ca52f9221900bb58602759a8d2;p=fw%2Faltos diff --git a/altosuilib/AltosGraphNew.java b/altosuilib/AltosGraphNew.java index 08a33730..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); @@ -133,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,