X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=micropeak%2FMicroData.java;h=e786ff1ed136de4e6800feb1263094f38af42a30;hb=104b8bfc9b37fda175f2cb2a1e33601fbf6f48f6;hp=26e3c07dc41851e75efd886a6ac900655633cab8;hpb=ab9caa22ea905844a99e08b5f6d3b072f094283e;p=fw%2Faltos

diff --git a/micropeak/MicroData.java b/micropeak/MicroData.java
index 26e3c07d..e786ff1e 100644
--- a/micropeak/MicroData.java
+++ b/micropeak/MicroData.java
@@ -20,7 +20,7 @@ package org.altusmetrum.micropeak;
 import java.lang.*;
 import java.io.*;
 import java.util.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_3.*;
 import org.altusmetrum.altosuilib_1.*;
 
 class MicroIterator implements Iterator<MicroDataPoint> {
@@ -98,14 +98,15 @@ public class MicroData implements AltosUIDataSet {
 	private double		ground_altitude;
 	private ArrayList<Integer>	bytes;
 	String			name;
+	MicroStats		stats;
 	
-	class FileEndedException extends Exception {
+	public class FileEndedException extends Exception {
 	}
 
-	class NonHexcharException extends Exception {
+	public class NonHexcharException extends Exception {
 	}
 
-	class InvalidCrcException extends Exception {
+	public class InvalidCrcException extends Exception {
 	}
 
 	private int getc(InputStream f) throws IOException, FileEndedException {
@@ -166,14 +167,10 @@ public class MicroData implements AltosUIDataSet {
 		return h;
 	}
 
-	private boolean find_header(InputStream f) throws IOException {
-		try {
-			for (;;) {
-				if (get_nonwhite(f) == 'M' && get_nonwhite(f) == 'P')
-					return true;
-			}
-		} catch (FileEndedException fe) {
-			return false;
+	private boolean find_header(InputStream f) throws IOException, FileEndedException {
+		for (;;) {
+			if (get_nonwhite(f) == 'M' && get_nonwhite(f) == 'P')
+				return true;
 		}
 	} 
 
@@ -338,7 +335,7 @@ public class MicroData implements AltosUIDataSet {
 		this.name = name;
 	}
 
-	public MicroData (InputStream f, String name) throws IOException, InterruptedException {
+	public MicroData (InputStream f, String name) throws IOException, InterruptedException, NonHexcharException, FileEndedException {
 		this.name = name;
 		bytes = new ArrayList<Integer>();
 		if (!find_header(f))
@@ -380,10 +377,9 @@ public class MicroData implements AltosUIDataSet {
 			crc_valid = crc == current_crc;
 
 			time_step = 0.192;
+			stats = new MicroStats(this);
 		} catch (FileEndedException fe) {
 			throw new IOException("File Ended Unexpectedly");
-		} catch (NonHexcharException ne) {
-			throw new IOException("Non hexadecimal character found");
 		}
 	}