X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=a27aa37f9b8fe6d9400a50eaae9069565706f17d;hb=81bb6f42d8b859195ea5a35806c42d98ba82e8e1;hp=e98c302bf9af1c4863dd50cbf52390fd359d0a28;hpb=f558cfa1df77c36a459168c1953d0945ee5a7f9f;p=fw%2Faltos

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index e98c302b..a27aa37f 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -23,23 +23,31 @@ 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 = 
             new AltosGraphTime.TimeSeries("Height (m)", "Height (AGL)", red) {
                 public void gotTimeData(double time, AltosDataPoint d) {
-                    series.add(time, d.height()); 
+			double	height = d.height();
+			if (height != AltosRecord.MISSING)
+				series.add(time, d.height()); 
                 } 
             };
     
         AltosGraphTime.Element speed =
             new AltosGraphTime.TimeSeries("Speed (m/s)", "Vertical Speed", green) { 
                 public void gotTimeData(double time, AltosDataPoint d) {
-                    if (d.state() < Altos.ao_flight_drogue) {
-                        series.add(time, d.accel_speed());
+		    double	speed;
+		    if (d.state() < Altos.ao_flight_drogue && d.has_accel()) {
+			speed = d.accel_speed();
                     } else {
-                        series.add(time, d.baro_speed());
+			speed = d.baro_speed();
                     }
+		    if (speed != AltosRecord.MISSING)
+			series.add(time, speed);
                 }
             };
     
@@ -48,7 +56,9 @@ public class AltosGraphUI extends JFrame
                     "Axial Acceleration", blue) 
             {
                 public void gotTimeData(double time, AltosDataPoint d) {
-                    series.add(time, d.acceleration());
+		    double acceleration = d.acceleration();
+		    if (acceleration != AltosRecord.MISSING)
+			series.add(time, acceleration);
                 }
             };
     
@@ -57,23 +67,29 @@ public class AltosGraphUI extends JFrame
                     "Board temperature", red) 
             {
                 public void gotTimeData(double time, AltosDataPoint d) {
-                    series.add(time, d.temperature());
+		    double temp = d.temperature();
+		    if (temp != AltosRecord.MISSING)
+			series.add(time, d.temperature());
                 }
             };
     
         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) {
-                    series.add(time, d.drogue_voltage());
+		    double v = d.drogue_voltage();
+		    if (v != AltosRecord.MISSING)
+			series.add(time, v);
                 }
             };
     
         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) {
-                    series.add(time, d.main_voltage());
+		    double v = d.main_voltage();
+		    if (v != AltosRecord.MISSING)
+			series.add(time, v);
                 }
             };
     
@@ -99,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)