X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=7d5ac93ac32adb1497160c0867654d32fd90da9f;hp=2cb0c47935d10ca6c77b70035b56f842c62b6d4d;hb=f317f1324b69b4241f4bb192e164b33d712d5a43;hpb=4738cb2fc639adb1d9237e6c903479f0690dd81a

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 2cb0c479..7d5ac93a 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -391,21 +391,12 @@ public class AltosUI extends JFrame {
 		}
 	}
 
-	class TelemetryThread extends DisplayThread {
-
-		String readline() throws InterruptedException { return null; }
-
-		AltosRecord read() throws InterruptedException, ParseException {
-			return new AltosTelemetry(readline());
-		}
-	}
-
-	class DeviceThread extends TelemetryThread {
+	class DeviceThread extends DisplayThread {
 		AltosSerial	serial;
 		LinkedBlockingQueue<String> telem;
 
-		String readline() throws InterruptedException {
-			return telem.take();
+		AltosRecord read() throws InterruptedException, ParseException {
+			return new AltosTelemetry(telem.take());
 		}
 
 		void close() {
@@ -453,36 +444,30 @@ public class AltosUI extends JFrame {
 	 * Open an existing telemetry file and replay it in realtime
 	 */
 
-	class ReplayTelemetryThread extends TelemetryThread {
-		FileInputStream	replay;
-
-		ReplayTelemetryThread(FileInputStream in, String in_name) {
-			replay = in;
-			name = in_name;
-		}
+	class ReplayThread extends DisplayThread {
+		AltosReader	reader;
+		String		name;
 
-		String readline() {
+		public AltosRecord read() {
 			try {
-				String	line = AltosRecord.gets(replay);
-				System.out.printf("telemetry line %s\n", line);
-				return line;
-			} catch (IOException ee) {
+				return reader.read();
+			} catch (IOException ie) {
 				JOptionPane.showMessageDialog(AltosUI.this,
 							      name,
 							      "error reading",
 							      JOptionPane.ERROR_MESSAGE);
+			} catch (ParseException pe) {
 			}
 			return null;
 		}
 
-		void close () {
-			try {
-				replay.close();
-			} catch (IOException ee) {
-			}
+		public void close () {
 			report();
 		}
 
+		public ReplayThread(AltosReader in_reader, String in_name) {
+			reader = in_reader;
+		}
 		void update(AltosState state) throws InterruptedException {
 			/* Make it run in realtime after the rocket leaves the pad */
 			if (state.state > Altos.ao_flight_pad)
@@ -490,40 +475,16 @@ public class AltosUI extends JFrame {
 		}
 	}
 
-	class ReplayEepromThread extends DisplayThread {
-		FileInputStream	replay;
-
-		AltosEepromReader	reader;
-
-		ReplayEepromThread(FileInputStream in, String in_name) {
-			replay = in;
-			name = in_name;
-			reader = new AltosEepromReader (in);
+	class ReplayTelemetryThread extends ReplayThread {
+		ReplayTelemetryThread(FileInputStream in, String in_name) {
+			super(new AltosTelemetryReader(in), in_name);
 		}
 
-		AltosRecord read () throws ParseException {
-			try {
-				return reader.read();
-			} catch (IOException ee) {
-				JOptionPane.showMessageDialog(AltosUI.this,
-							      name,
-							      "error reading",
-							      JOptionPane.ERROR_MESSAGE);
-			}
-			return null;
-		}
+	}
 
-		void close () {
-			try {
-				replay.close();
-			} catch (IOException ee) {
-			}
-			report();
-		}
-		void update(AltosState state) throws InterruptedException {
-			/* Make it run in realtime after the rocket leaves the pad */
-			if (state.state > Altos.ao_flight_pad)
-				Thread.sleep((int) (Math.min(state.time_change,10) * 1000));
+	class ReplayEepromThread extends ReplayThread {
+		ReplayEepromThread(FileInputStream in, String in_name) {
+			super(new AltosEepromReader(in), in_name);
 		}
 	}