X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=f59f70bab47781daf0783e747875e2ec45542152;hb=371da0c909098092db7b596496df9d58eed43703;hp=e0e030933257a4cb7fd6075e15e9746a7687efeb;hpb=382c54a0d052c8975b57c995ef83bc8934bde242;p=fw%2Faltos

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index e0e03093..f59f70ba 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 {
@@ -40,12 +40,7 @@ public class AltosGraphUI extends AltosFrame
         AltosGraphTime.Element speed =
 		new AltosGraphTime.TimeSeries(String.format("Speed (%s)", AltosConvert.speed.show_units()), "Vertical Speed", green) { 
                 public void gotTimeData(double time, AltosDataPoint d) {
-		    double	speed;
-		    if (d.state() < Altos.ao_flight_drogue && d.has_accel()) {
-			speed = d.accel_speed();
-                    } else {
-			speed = d.baro_speed();
-                    }
+		    double	speed = d.speed();
 		    if (speed != AltosRecord.MISSING)
 			    series.add(time, AltosConvert.speed.value(speed));
                 }
@@ -94,7 +89,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 +138,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 +154,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 +171,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 +220,13 @@ public class AltosGraphUI extends AltosFrame
         return createGraphsWhich(data, which).get(0);
     }
 
+    /*
     private static ArrayList<AltosGraph> createGraphs(
             Iterable<AltosDataPoint> data)
     {
         return createGraphsWhich(data, -1);
     }
+    */
 
     private static ArrayList<AltosGraph> createGraphsWhich(
             Iterable<AltosDataPoint> data, int which)