altosui: Create iterables for log file scanning. Split out display threads

Convert from log file reading paradigm to using iterators which is
more idiomatic for java. Split more code out of AltosUI.java,
including the display update threads for telemetry monitoring and
logfile replay.x

Signed-off-by: Keith Packard <keithp@keithp.com>

1 files changed, 0 insertions, 88 deletions

diff --git a/ao-tools/altosui/AltosTelemetryReader.java b/ao-tools/altosui/AltosTelemetryReader.java
deleted file mode 100644
index 3564a0a5..00000000
--- a/ao-tools/altosui/AltosTelemetryReader.java
+++ /dev/null
@@ -1,88 +0,0 @@
-/*
- * Copyright © 2010 Keith Packard <keithp@keithp.com>
- *
- * This program is free software; you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
- *
- * This program is distributed in the hope that it will be useful, but
- * WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- * General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License along
- * with this program; if not, write to the Free Software Foundation, Inc.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
- */
-
-package altosui;
-
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import altosui.AltosTelemetry;
-
-public class AltosTelemetryReader extends AltosReader {
-	LinkedList<AltosRecord>	records;
-
-	Iterator<AltosRecord> record_iterator;
-
-	int	boost_tick;
-
-	public AltosRecord read() throws IOException, ParseException {
-		AltosRecord	r;
-		if (!record_iterator.hasNext())
-			return null;
-
-		r = record_iterator.next();
-		r.time = (r.tick - boost_tick) / 100.0;
-		return r;
-	}
-
-	public AltosTelemetryReader (FileInputStream input) {
-		boolean saw_boost = false;
-		int	current_tick = 0;
-
-		records = new LinkedList<AltosRecord> ();
-
-		try {
-			for (;;) {
-				String line = AltosRecord.gets(input);
-				if (line == null) {
-					break;
-				}
-				try {
-					AltosTelemetry record = new AltosTelemetry(line);
-					if (record == null)
-						break;
-					if (records.isEmpty()) {
-						current_tick = record.tick;
-					} else {
-						int tick = record.tick | (current_tick & ~ 0xffff);
-						if (tick < current_tick - 0x1000)
-							tick += 0x10000;
-						current_tick = tick;
-						record.tick = current_tick;
-					}
-					if (!saw_boost && record.state >= Altos.ao_flight_boost)
-					{
-						saw_boost = true;
-						boost_tick = record.tick;
-					}
-					records.add(record);
-				} catch (ParseException pe) {
-					System.out.printf("parse exception %s\n", pe.getMessage());
-				} catch (AltosCRCException ce) {
-					System.out.printf("crc error\n");
-				}
-			}
-		} catch (IOException io) {
-			System.out.printf("io exception\n");
-		}
-		record_iterator = records.iterator();
-		try {
-			input.close();
-		} catch (IOException ie) {
-		}
-	}
-}