X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=cb8e3d2072595d0ef0dcd6f8659fc7e7abb058e3;hb=19243ecc9b5bbdcc069ae24acf1ca807322c84d8;hp=e0e030933257a4cb7fd6075e15e9746a7687efeb;hpb=382c54a0d052c8975b57c995ef83bc8934bde242;p=fw%2Faltos diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java index e0e03093..cb8e3d20 100644 --- a/altosui/AltosGraphUI.java +++ b/altosui/AltosGraphUI.java @@ -22,9 +22,9 @@ public class AltosGraphUI extends AltosFrame static final private Color red = new Color(194,31,31); 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 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 cyan = new Color(31,194,194); static final private Color magenta = new Color(194,31,194); static private class OverallGraphs { @@ -94,7 +94,7 @@ public class AltosGraphUI extends AltosFrame } }; - AltosGraphTime.Element e_pad = new AltosGraphTime.StateMarker(Altos.ao_flight_pad, "Pad"); + //AltosGraphTime.Element e_pad = new AltosGraphTime.StateMarker(Altos.ao_flight_pad, "Pad"); AltosGraphTime.Element e_boost = new AltosGraphTime.StateMarker(Altos.ao_flight_boost, "Boost"); AltosGraphTime.Element e_fast = new AltosGraphTime.StateMarker(Altos.ao_flight_fast, "Fast"); AltosGraphTime.Element e_coast = new AltosGraphTime.StateMarker(Altos.ao_flight_coast, "Coast"); @@ -143,7 +143,8 @@ public class AltosGraphUI extends AltosFrame return graphs; } } - + + /* static private class AscentGraphs extends OverallGraphs { protected AltosGraphTime myAltosGraphTime(String suffix) { return (new AltosGraphTime("Ascent " + suffix) { @@ -158,7 +159,9 @@ public class AltosGraphUI extends AltosFrame .addElement(e_coast); } } - + */ + + /* static private class DescentGraphs extends OverallGraphs { protected AltosGraphTime myAltosGraphTime(String suffix) { return (new AltosGraphTime("Descent " + suffix) { @@ -173,13 +176,12 @@ public class AltosGraphUI extends AltosFrame // ((XYGraph)graph[8]).ymin = new Double(-50); } } + */ public AltosGraphUI(AltosRecordIterable records, String name) throws InterruptedException, IOException { super(String.format("Altos Graph %s", name)); AltosDataPointReader reader = new AltosDataPointReader (records); - if (reader == null) - return; if (reader.has_accel) init(reader, records, 0); @@ -223,11 +225,13 @@ public class AltosGraphUI extends AltosFrame return createGraphsWhich(data, which).get(0); } + /* private static ArrayList createGraphs( Iterable data) { return createGraphsWhich(data, -1); } + */ private static ArrayList createGraphsWhich( Iterable data, int which)