X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMicroRaw.java;h=d1d5d07682a1bc4c1bff1c25e4970adf6c8bec56;hb=a61217f0a6d0ef48b6471f632c4600255867e831;hp=6b006f32eb55136e7890cfcfa054c389cb9f7d08;hpb=31fa139578a86821844e3e2efb1a84bdea4f1370;p=fw%2Faltos

diff --git a/micropeak/MicroRaw.java b/micropeak/MicroRaw.java
index 6b006f32..d1d5d076 100644
--- 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,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_12.*;
+import org.altusmetrum.altosuilib_12.*;
 
-public class MicroRaw extends TextArea {
+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.length());
+			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);
 	}
 }