X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=micropeak%2FMicroData.java;h=fdfb2dc4e67fef8354b2130eb69e0bfb25ba4d37;hp=783ae40f7a459c5f1d6f22f024c3d4045bd35482;hb=f20781010a6560b7b359af269c502d098917c446;hpb=bf8e1b6eecb2bae12ffdbd730bd6ec12ccdaf23a

diff --git a/micropeak/MicroData.java b/micropeak/MicroData.java
index 783ae40f..fdfb2dc4 100644
--- a/micropeak/MicroData.java
+++ b/micropeak/MicroData.java
@@ -22,6 +22,40 @@ import java.io.*;
 import java.util.*;
 import org.altusmetrum.AltosLib.*;
 
+class MicroIterator implements Iterator<MicroDataPoint> {
+	int		i;
+	MicroData	data;
+
+	public boolean hasNext() {
+		return i < data.pressures.length;
+	}
+
+	public MicroDataPoint next() {
+		return new MicroDataPoint(data, i++);
+	}
+
+	public MicroIterator (MicroData data) {
+		this.data = data;
+		i = 0;
+	}
+
+	public void remove() {
+	}
+}
+
+class MicroIterable implements Iterable<MicroDataPoint> {
+
+	MicroData	data;
+
+	public Iterator<MicroDataPoint> iterator() {
+		return new MicroIterator(data);
+	}
+
+	public MicroIterable(MicroData data) {
+		this.data = data;
+	}
+}
+
 public class MicroData {
 	public int		ground_pressure;
 	public int		min_pressure;
@@ -29,6 +63,7 @@ public class MicroData {
 	private double		time_step;
 	private double		ground_altitude;
 	private ArrayList<Integer>	bytes;
+	String			name;
 	
 
 	class FileEndedException extends Exception {
@@ -143,6 +178,10 @@ public class MicroData {
 		return AltosConvert.pressure_to_altitude(pressures[i]);
 	}
 
+	public Iterable<MicroDataPoint> points() {
+		return new MicroIterable(this);
+	}
+
 	int fact(int n) {
 		if (n == 0)
 			return 1;
@@ -182,6 +221,10 @@ public class MicroData {
 		return alt;
 	}
 
+	public double pressure(int i) {
+		return pressures[i];
+	}
+
 	public double height(int i) {
 		return altitude(i) - ground_altitude;
 	}
@@ -217,12 +260,27 @@ public class MicroData {
 	public void save (OutputStream f) throws IOException {
 		for (int c : bytes)
 			f.write(c);
+		f.write('\n');
 	}
 
-	public MicroData (InputStream f) throws IOException {
+	public void export (Writer f) throws IOException {
+		PrintWriter	pw = new PrintWriter(f);
+		pw.printf("  Time, Press, Height,  Speed,  Accel\n");
+		for (MicroDataPoint point : points()) {
+			pw.printf("%6.3f,%6.0f,%7.1f,%7.2f,%7.2f\n",
+				  point.time, point.pressure, point.height, point.speed, point.accel);
+		}
+	}
+
+	public void set_name(String name) {
+		this.name = name;
+	}
+
+	public MicroData (InputStream f, String name) throws IOException, InterruptedException {
+		this.name = name;
 		bytes = new ArrayList<Integer>();
 		if (!find_header(f))
-			throw new IOException();
+			throw new IOException("No MicroPeak data header found");
 		try {
 			file_crc = 0xffff;
 			ground_pressure = get_32(f);
@@ -261,10 +319,17 @@ public class MicroData {
 
 			time_step = 0.192;
 		} catch (FileEndedException fe) {
-			throw new IOException();
+			throw new IOException("File Ended Unexpectedly");
 		} catch (NonHexcharException ne) {
-			throw new IOException();
+			throw new IOException("Non hexadecimal character found");
 		}
 	}
+
+	public MicroData() {
+		ground_pressure = 101000;
+		min_pressure = 101000;
+		pressures = new int[1];
+		pressures[0] = 101000;
+	}
 	
 }