X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosGraphNew.java;fp=altosuilib%2FAltosGraphNew.java;h=c0afd652a7bd36ea22f08a4fadcbdbc9ca64dfe6;hb=9e17d3be199d14473d8a7f9b899c290518b879a6;hp=a9393f9483c21cdbba1d6d93f7735604085a6f8a;hpb=a1d76d5568f8386c52704d69507132de23ea591f;p=fw%2Faltos diff --git a/altosuilib/AltosGraphNew.java b/altosuilib/AltosGraphNew.java index a9393f94..c0afd652 100644 --- a/altosuilib/AltosGraphNew.java +++ b/altosuilib/AltosGraphNew.java @@ -82,7 +82,8 @@ 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; @@ -159,6 +160,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 +311,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)); } }