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>

3 files changed, 14 insertions, 12 deletions

diff --git a/altoslib/AltosSpeed.java b/altoslib/AltosSpeed.java
index af63ed17..4e2daf5a 100644
--- a/altoslib/AltosSpeed.java
+++ b/altoslib/AltosSpeed.java
@@ -21,19 +21,19 @@ public class AltosSpeed extends AltosUnits {
 
 	public double value(double v) {
 		if (AltosConvert.imperial_units)
-			return AltosConvert.meters_to_feet(v);
+			return AltosConvert.meters_to_mph(v);
 		return v;
 	}
 
 	public String show_units() {
 		if (AltosConvert.imperial_units)
-			return "ft/s";
+			return "mph";
 		return "m/s";
 	}
 
 	public String say_units() {
 		if (AltosConvert.imperial_units)
-			return "feet per second";
+			return "miles per hour";
 		return "meters per second";
 	}
 
diff --git a/micropeak/MicroData.java b/micropeak/MicroData.java
index d3c8c43e..f1204e11 100644
--- a/micropeak/MicroData.java
+++ b/micropeak/MicroData.java
@@ -265,15 +265,15 @@ public class MicroData {
 
 	public void export (Writer f) throws IOException {
 		PrintWriter	pw = new PrintWriter(f);
-		pw.printf("  Time, Press(Pa), Height(m), Height(f), Speed(m/s), Speed(ft/s), Speed(mach), Accel(m/s²), Accel(ft/s²),  Accel(g)\n");
+		pw.printf("  Time, Press(Pa), Height(m), Height(f), Speed(m/s), Speed(mph), Speed(mach), Accel(m/s²), Accel(ft/s²),  Accel(g)\n");
 		for (MicroDataPoint point : points()) {
-			pw.printf("%6.3f,%10.0f,%10.1f,%10.1f,%11.2f,%12.2f,%12.4f,%12.2f,%13.2f,%10.4f\n",
+			pw.printf("%6.3f,%10.0f,%10.1f,%10.1f,%11.2f,%11.2f,%12.4f,%12.2f,%13.2f,%10.4f\n",
 				  point.time,
 				  point.pressure,
 				  point.height,
 				  AltosConvert.meters_to_feet(point.height),
 				  point.speed,
-				  AltosConvert.meters_to_feet(point.speed),
+				  AltosConvert.meters_to_mph(point.speed),
 				  AltosConvert.meters_to_mach(point.speed),
 				  point.accel,
 				  AltosConvert.meters_to_feet(point.accel),
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()));
 		}
 	}