projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
document workaround for 'make fat' not building altoslib
[fw/altos]
/
altosui
/
AltosGraphUI.java
diff --git
a/altosui/AltosGraphUI.java
b/altosui/AltosGraphUI.java
index b571fc7d59271d5d4eda971a52488de388474828..edde1307e17d60dc6bae8b1baa8ca3980987f4ae 100644
(file)
--- a/
altosui/AltosGraphUI.java
+++ b/
altosui/AltosGraphUI.java
@@
-2,7
+2,7
@@
// Copyright (c) 2010 Anthony Towns
// GPL v2 or later
// Copyright (c) 2010 Anthony Towns
// GPL v2 or later
-package
AltosUI
;
+package
altosui
;
import java.io.*;
import java.util.ArrayList;
import java.io.*;
import java.util.ArrayList;
@@
-35,16
+35,16
@@
public class AltosGraphUI extends AltosFrame
static private class OverallGraphs {
AltosGraphTime.Element height =
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)
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 =
}
};
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()) {
public void gotTimeData(double time, AltosDataPoint d) {
double speed;
if (d.state() < Altos.ao_flight_drogue && d.has_accel()) {
@@
-53,18
+53,19
@@
public class AltosGraphUI extends AltosFrame
speed = d.baro_speed();
}
if (speed != AltosRecord.MISSING)
speed = d.baro_speed();
}
if (speed != AltosRecord.MISSING)
-
series.add(time, speed
);
+
series.add(time, AltosConvert.speed.value(speed)
);
}
};
AltosGraphTime.Element acceleration =
}
};
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)
{
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)
);
}
};
}
};