diff options
| author | Keith Packard <keithp@keithp.com> | 2013-01-03 18:14:40 -0800 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2013-01-03 18:14:40 -0800 |
| commit | ca284d8bef2f4bd360eaec58048ba9abdafc55bd (patch) | |
| tree | 3d2ff8ab329ba610e1e9b6451431586d5756786c /micropeak/MicroData.java | |
| parent | 81088b42b3ea899c8d1b3f09ee4fe24378fa03c9 (diff) | |
micropeak: Use data.export for Raw display. Change to MPH
data.export already knows how to format stuff, so use that to
construct the raw data presentation for the GUI too.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'micropeak/MicroData.java')
| -rw-r--r-- | micropeak/MicroData.java | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/micropeak/MicroData.java b/micropeak/MicroData.java index d3c8c43e..f1204e11 100644 --- a/micropeak/MicroData.java +++ b/micropeak/MicroData.java @@ -265,15 +265,15 @@ public class MicroData { public void export (Writer f) throws IOException { PrintWriter pw = new PrintWriter(f); - pw.printf(" Time, Press(Pa), Height(m), Height(f), Speed(m/s), Speed(ft/s), Speed(mach), Accel(m/s²), Accel(ft/s²), Accel(g)\n"); + pw.printf(" Time, Press(Pa), Height(m), Height(f), Speed(m/s), Speed(mph), Speed(mach), Accel(m/s²), Accel(ft/s²), Accel(g)\n"); for (MicroDataPoint point : points()) { - pw.printf("%6.3f,%10.0f,%10.1f,%10.1f,%11.2f,%12.2f,%12.4f,%12.2f,%13.2f,%10.4f\n", + pw.printf("%6.3f,%10.0f,%10.1f,%10.1f,%11.2f,%11.2f,%12.4f,%12.2f,%13.2f,%10.4f\n", point.time, point.pressure, point.height, AltosConvert.meters_to_feet(point.height), point.speed, - AltosConvert.meters_to_feet(point.speed), + AltosConvert.meters_to_mph(point.speed), AltosConvert.meters_to_mach(point.speed), point.accel, AltosConvert.meters_to_feet(point.accel), |