X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosGraphUI.java;h=edde1307e17d60dc6bae8b1baa8ca3980987f4ae;hp=c30dc476048d55a2e1b661697c2b45b54b2141e8;hb=7ae3e4cea1cd180ff18b5293a67b4520cc8292be;hpb=7ecde50fbebe68a2e2200a2f8d081fd37074f840

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index c30dc476..edde1307 100644
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -12,6 +12,7 @@ import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
 import javax.swing.table.*;
+import org.altusmetrum.AltosLib.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.ChartUtilities;
@@ -34,16 +35,16 @@ public class AltosGraphUI extends AltosFrame
 
     static private class OverallGraphs {
         AltosGraphTime.Element height = 
-            new AltosGraphTime.TimeSeries("Height (m)", "Height (AGL)", red) {
+		new AltosGraphTime.TimeSeries(String.format("Height (%s)", AltosConvert.height.show_units()), "Height (AGL)", red) {
                 public void gotTimeData(double time, AltosDataPoint d) {
 			double	height = d.height();
 			if (height != AltosRecord.MISSING)
-				series.add(time, d.height()); 
+				series.add(time, AltosConvert.height.value(height));
                 } 
             };
     
         AltosGraphTime.Element speed =
-            new AltosGraphTime.TimeSeries("Speed (m/s)", "Vertical Speed", green) { 
+		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()) {
@@ -52,18 +53,19 @@ public class AltosGraphUI extends AltosFrame
 			speed = d.baro_speed();
                     }
 		    if (speed != AltosRecord.MISSING)
-			series.add(time, speed);
+			    series.add(time, AltosConvert.speed.value(speed));
                 }
             };
     
         AltosGraphTime.Element acceleration =
-            new AltosGraphTime.TimeSeries("Acceleration (m/s\u00B2)", 
-                    "Axial Acceleration", blue) 
+		new AltosGraphTime.TimeSeries(String.format("Acceleration (%s)",
+							    AltosConvert.accel.show_units()),
+					      "Axial Acceleration", blue)
             {
                 public void gotTimeData(double time, AltosDataPoint d) {
 		    double acceleration = d.acceleration();
 		    if (acceleration != AltosRecord.MISSING)
-			series.add(time, acceleration);
+			    series.add(time, AltosConvert.accel.value(acceleration));
                 }
             };