X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=a27aa37f9b8fe6d9400a50eaae9069565706f17d;hb=a680ce61bdcffeacb7f0e4dcef71a03cb7cfe07d;hp=942688d2b2d4e4653be93b35949481c96dda2dae;hpb=c1f859170b37864b816eb561318dbfb1cafaeed6;p=fw%2Faltos diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index 942688d2..a27aa37f 100644 --- a/altosui/AltosGraphUI.java +++ b/altosui/AltosGraphUI.java @@ -23,6 +23,9 @@ public class AltosGraphUI extends JFrame static final private Color green = new Color(31,194,31); static final private Color blue = new Color(31,31,194); static final private Color black = new Color(31,31,31); + static final private Color yellow = new Color(194,194,31); + static final private Color cyan = new Color(31,194,194); + static final private Color magenta = new Color(194,31,194); static private class OverallGraphs { AltosGraphTime.Element height = @@ -71,7 +74,7 @@ public class AltosGraphUI extends JFrame }; AltosGraphTime.Element drogue_voltage = - new AltosGraphTime.TimeSeries("Voltage (V)", "Drogue Continuity", blue) + new AltosGraphTime.TimeSeries("Voltage (V)", "Drogue Continuity", yellow) { public void gotTimeData(double time, AltosDataPoint d) { double v = d.drogue_voltage(); @@ -81,7 +84,7 @@ public class AltosGraphUI extends JFrame }; AltosGraphTime.Element main_voltage = - new AltosGraphTime.TimeSeries("Voltage (V)", "Main Continuity", green) + new AltosGraphTime.TimeSeries("Voltage (V)", "Main Continuity", magenta) { public void gotTimeData(double time, AltosDataPoint d) { double v = d.main_voltage(); @@ -112,7 +115,9 @@ public class AltosGraphUI extends JFrame graphs.add( myAltosGraphTime("Summary") .addElement(height) .addElement(speed) - .addElement(acceleration) ); + .addElement(acceleration) + .addElement(drogue_voltage) + .addElement(main_voltage) ); graphs.add( myAltosGraphTime("Summary") .addElement(height)