X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=b7c2e92e74c07ea3cad46cba633e71f88fe5bc71;hp=cb8e3d2072595d0ef0dcd6f8659fc7e7abb058e3;hb=868ef0c9c4b208c02a87180b0eede329369bdc77;hpb=19243ecc9b5bbdcc069ae24acf1ca807322c84d8

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index cb8e3d20..b7c2e92e 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -29,7 +29,7 @@ public class AltosGraphUI extends AltosFrame
 
     static private class OverallGraphs {
         AltosGraphTime.Element height = 
-		new AltosGraphTime.TimeSeries(String.format("Height (%s)", AltosConvert.height.show_units()), "Height (AGL)", red) {
+		new AltosGraphTime.TimeSeries("Height", AltosConvert.height.show_units(), "Height (AGL)", red) {
                 public void gotTimeData(double time, AltosDataPoint d) {
 			double	height = d.height();
 			if (height != AltosRecord.MISSING)
@@ -38,22 +38,17 @@ public class AltosGraphUI extends AltosFrame
             };
     
         AltosGraphTime.Element speed =
-		new AltosGraphTime.TimeSeries(String.format("Speed (%s)", AltosConvert.speed.show_units()), "Vertical Speed", green) { 
+		new AltosGraphTime.TimeSeries("Speed", 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));
                 }
             };
     
         AltosGraphTime.Element acceleration =
-		new AltosGraphTime.TimeSeries(String.format("Acceleration (%s)",
-							    AltosConvert.accel.show_units()),
+		new AltosGraphTime.TimeSeries("Acceleration",
+					      AltosConvert.accel.show_units(),
 					      "Axial Acceleration", blue)
             {
                 public void gotTimeData(double time, AltosDataPoint d) {
@@ -64,8 +59,8 @@ public class AltosGraphUI extends AltosFrame
             };
     
         AltosGraphTime.Element temperature =
-            new AltosGraphTime.TimeSeries("Temperature (\u00B0C)", 
-                    "Board temperature", red) 
+	    new AltosGraphTime.TimeSeries("Temperature", "\u00B0C", 
+					  "Board temperature", red) 
             {
                 public void gotTimeData(double time, AltosDataPoint d) {
 		    double temp = d.temperature();
@@ -75,7 +70,7 @@ public class AltosGraphUI extends AltosFrame
             };
     
         AltosGraphTime.Element drogue_voltage =
-            new AltosGraphTime.TimeSeries("Voltage (V)", "Drogue Continuity", yellow) 
+            new AltosGraphTime.TimeSeries("Voltage", "(V)", "Drogue Continuity", yellow) 
             {
                 public void gotTimeData(double time, AltosDataPoint d) {
 		    double v = d.drogue_voltage();
@@ -85,7 +80,7 @@ public class AltosGraphUI extends AltosFrame
             };
     
         AltosGraphTime.Element main_voltage =
-            new AltosGraphTime.TimeSeries("Voltage (V)", "Main Continuity", magenta) 
+            new AltosGraphTime.TimeSeries("Voltage", "(V)", "Main Continuity", magenta) 
             {
                 public void gotTimeData(double time, AltosDataPoint d) {
 		    double v = d.main_voltage();