altos/stm32f4: Align stack to 8 bytes

[fw/altos] / micropeak / MicroRaw.java

diff --git a/micropeak/MicroRaw.java b/micropeak/MicroRaw.java
index 6b006f32eb55136e7890cfcfa054c389cb9f7d08..9d022d0ac270819de1a4617b000c2f635b619fbd 100644 (file)
--- a/micropeak/MicroRaw.java
+++ b/micropeak/MicroRaw.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,24 +19,37 @@
 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_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
-public class MicroRaw extends TextArea {
+public class MicroRaw extends JTextArea implements AltosFontListener {
+
+       public void font_size_changed(int font_size) {
+               setFont(AltosUILib.table_value_font);
+       }
 
        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.length());
+                       setText(sw.toString());
+               } catch (IOException ie) {
+                       setText(String.format("Error writing data: %s", ie.getMessage()));
                }
+               setCaretPosition(0);
+       }
+
+       public void tell_closing() {
+               AltosUIPreferences.unregister_font_listener(this);
        }
 
        public MicroRaw() {
                super(1, 30);
                setFont(AltosUILib.table_value_font);
+               setEditable(false);
+               AltosUIPreferences.register_font_listener(this);
        }
 }