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

diff --git a/micropeak/MicroRaw.java b/micropeak/MicroRaw.java
index 6b006f32..0520fa71 100644
--- 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_2.*;
+import org.altusmetrum.altosuilib_1.*;
 
-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.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);
 	}
 }