Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / micropeak / MicroRaw.java

diff --git a/micropeak/MicroRaw.java b/micropeak/MicroRaw.java
index f5bea76ffa0a59a3727e1d49a81ce7b3a8dc479f..7a225dcbcc39933c7e557a292516753548889a9c 100644 (file)
--- a/micropeak/MicroRaw.java
+++ b/micropeak/MicroRaw.java
@@ -18,24 +18,28 @@
 package org.altusmetrum.micropeak;
 
 import java.awt.*;
+import java.io.*;
 import javax.swing.*;
-import org.altusmetrum.AltosLib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 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()));
                }
+               setCaretPosition(0);
        }
 
        public MicroRaw() {
                super(1, 30);
                setFont(AltosUILib.table_value_font);
+               setEditable(false);
        }
 }