summaryrefslogtreecommitdiff
path: root/micropeak/MicroRaw.java
diff options
context:
space:
mode:
authorKeith Packard <keithp@keithp.com>2013-01-03 18:14:40 -0800
committerKeith Packard <keithp@keithp.com>2013-01-03 18:14:40 -0800
commitca284d8bef2f4bd360eaec58048ba9abdafc55bd (patch)
tree3d2ff8ab329ba610e1e9b6451431586d5756786c /micropeak/MicroRaw.java
parent81088b42b3ea899c8d1b3f09ee4fe24378fa03c9 (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/MicroRaw.java')
-rw-r--r--micropeak/MicroRaw.java14
1 files changed, 8 insertions, 6 deletions
diff --git a/micropeak/MicroRaw.java b/micropeak/MicroRaw.java
index f5bea76f..dd480bfe 100644
--- a/micropeak/MicroRaw.java
+++ b/micropeak/MicroRaw.java
@@ -18,6 +18,7 @@
package org.altusmetrum.micropeak;
import java.awt.*;
+import java.io.*;
import javax.swing.*;
import org.altusmetrum.AltosLib.*;
import org.altusmetrum.altosuilib.*;
@@ -25,12 +26,13 @@ import org.altusmetrum.altosuilib.*;
public class MicroRaw extends JTextArea {
public void setData(MicroData data) {
- setRows(data.pressures.length);
- setText(" Time, Press, Height, Speed, Accel\n");
- for (MicroDataPoint point : data.points()) {
- append(String.format(
- "%6.3f,%6.0f,%7.1f,%7.2f,%7.2f\n",
- point.time, point.pressure, point.height, point.speed, point.accel));
+ StringWriter sw = new StringWriter();
+ try {
+ data.export(sw);
+ setRows(data.pressures.length + 1);
+ setText(sw.toString());
+ } catch (IOException ie) {
+ setText(String.format("Error writing data: %s", ie.getMessage()));
}
}