X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosuilib%2FAltosGraph.java;h=1ccde1d6c2e341a2930dc636b603e4f565ff47d7;hb=ec00f55171a6c5c827c1296178be43d311801be8;hp=5236008f32a395aff091496d5cdeef6321f93d0e;hpb=0ab2332358eb0990cb55074001b675d390eae2ca;p=fw%2Faltos diff --git a/altosuilib/AltosGraph.java b/altosuilib/AltosGraph.java index 5236008f..1ccde1d6 100644 --- 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_13; +package org.altusmetrum.altosuilib_14; import java.io.*; import java.util.ArrayList; import java.awt.*; import javax.swing.*; -import org.altusmetrum.altoslib_13.*; +import org.altusmetrum.altoslib_14.*; import org.jfree.ui.*; import org.jfree.chart.*; @@ -88,6 +88,8 @@ public class AltosGraph extends AltosUIGraph { static final private AltosUILineStyle mag_through_color = new AltosUILineStyle(); static final private AltosUILineStyle mag_total_color = new AltosUILineStyle(); + static final private AltosUILineStyle motor_pressure_color = new AltosUILineStyle(); + static AltosUnits dop_units = null; static AltosUnits tick_units = null; @@ -100,6 +102,7 @@ public class AltosGraph extends AltosUIGraph { AltosUIAxis pressure_axis, thrust_axis; AltosUIAxis gyro_axis, orient_axis, mag_axis; AltosUIAxis course_axis, dop_axis, tick_axis; + AltosUIAxis motor_pressure_axis; 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)); @@ -122,6 +125,8 @@ public class AltosGraph extends AltosUIGraph { course_axis = newAxis("Course", AltosConvert.orient, gps_course_color, 0); dop_axis = newAxis("Dilution of Precision", dop_units, gps_pdop_color, 0); + motor_pressure_axis = newAxis("Motor Pressure", AltosConvert.pressure, motor_pressure_color, 0); + flight_series.register_axis("default", speed_color, false, @@ -352,6 +357,11 @@ public class AltosGraph extends AltosUIGraph { voltage_axis); } + flight_series.register_axis(AltosUIFlightSeries.motor_pressure_name, + motor_pressure_color, + true, + motor_pressure_axis); + flight_series.check_axes(); return flight_series.series(cal_data);