X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMicroExport.java;h=93c8cae8d34284be02835c0ae84fad995a1705e5;hb=8f2d82461f3cf5da157b23ea45a2fa60d56b196b;hp=06a0346996a309480ea0b142e41f50daf48a2301;hpb=2c423d9287c6b9ea7233f5e3430682cb1c865da1;p=fw%2Faltos

diff --git a/micropeak/MicroExport.java b/micropeak/MicroExport.java
index 06a03469..93c8cae8 100644
--- a/micropeak/MicroExport.java
+++ b/micropeak/MicroExport.java
@@ -23,14 +23,20 @@ import java.util.ArrayList;
 import java.awt.*;
 import javax.swing.*;
 import javax.swing.filechooser.FileNameExtensionFilter;
-import org.altusmetrum.AltosLib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altosuilib_6.*;
 
 public class MicroExport extends JFileChooser {
 
 	JFrame		frame;
 	MicroData	data;
 
+	public static void export(File file, MicroData data) throws FileNotFoundException, IOException {
+		FileWriter fw = new FileWriter(file);
+		data.export(fw);
+		fw.close();
+	}
+
 	public boolean runDialog() {
 		int	ret;
 
@@ -76,14 +82,7 @@ public class MicroExport extends JFileChooser {
 				}
 			}
 			try {
-				FileWriter fw = new FileWriter(file);
-				PrintWriter pw = new PrintWriter(fw);
-				pw.printf(" Time, Press, Height,  Speed,  Accel\n");
-				for (MicroDataPoint point : data.points()) {
-					pw.printf("%5.2f,%6.0f,%7.1f,%7.2f,%7.2f\n",
-						  point.time, point.pressure, point.height, point.speed, point.accel);
-				}
-				fw.close();
+				export(file, data);
 				return true;
 			} catch (FileNotFoundException fe) {
 				JOptionPane.showMessageDialog(frame,