X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosUI.java;h=ac121512c3a544eef1b8a9429ee7a0211bf61393;hp=b0cff38176d3abedf6d2d33fc51447e4a6812a1c;hb=da914cd72411af8c36af05b13c11b9093c8a378c;hpb=222158581887b5f9e8b9843d14321c313fa023fa

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index b0cff381..ac121512 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -311,12 +311,10 @@ public class AltosUI extends AltosUIFrame {
 			AltosUI.this);
 
 		AltosRecordSet set = chooser.runDialog();
-/* XXX fixme */
-//		if (states != null) {
-//			AltosFlightReader reader = new AltosReplayReader(states.iterator(),
-//									 chooser.file());
-//			new AltosFlightUI(voice, reader);
-//		}
+		if (set != null) {
+			AltosReplayReader reader = new AltosReplayReader(set, chooser.file());
+			new AltosFlightUI(voice, reader);
+		}
 	}
 
 	/* Connect to TeleMetrum, either directly or through
@@ -329,6 +327,7 @@ public class AltosUI extends AltosUIFrame {
 	private static AltosFlightSeries make_series(AltosRecordSet set) {
 		AltosFlightSeries series = new AltosFlightSeries(set.cal_data());
 		set.capture_series(series);
+		series.finish();
 		return series;
 	}
 
@@ -373,21 +372,6 @@ public class AltosUI extends AltosUIFrame {
 		}
 	}
 
-	static AltosRecordSet open_logfile(File file) {
-		try {
-			if (file.getName().endsWith("telem"))
-				return new AltosTelemetryFile(new FileInputStream(file));
-			else
-				return new AltosEepromFile(new FileReader(file));
-		} catch (FileNotFoundException fe) {
-			System.out.printf("%s\n", fe.getMessage());
-			return null;
-		} catch (IOException ie) {
-			System.out.printf("%s\n", ie.getMessage());
-			return null;
-		}
-	}
-
 	static AltosWriter open_csv(File file) {
 		try {
 			return new AltosCSV(file);
@@ -406,16 +390,27 @@ public class AltosUI extends AltosUIFrame {
 		}
 	}
 
+	static AltosRecordSet record_set(File input) {
+		try {
+			return AltosLib.record_set(input);
+		} catch (IOException ie) {
+			String message = ie.getMessage();
+			if (message == null)
+				message = String.format("%s (I/O error)", input.toString());
+			System.err.printf("%s\n", message);
+		}
+		return null;
+	}
+
 	static final int process_none = 0;
 	static final int process_csv = 1;
 	static final int process_kml = 2;
 	static final int process_graph = 3;
 	static final int process_replay = 4;
 	static final int process_summary = 5;
-	static final int process_cat = 6;
 
 	static boolean process_csv(File input) {
-		AltosRecordSet set = open_logfile(input);
+		AltosRecordSet set = record_set(input);
 		if (set == null)
 			return false;
 
@@ -436,7 +431,7 @@ public class AltosUI extends AltosUIFrame {
 	}
 
 	static boolean process_kml(File input) {
-		AltosRecordSet set = open_logfile(input);
+		AltosRecordSet set = record_set(input);
 		if (set == null)
 			return false;
 
@@ -450,39 +445,18 @@ public class AltosUI extends AltosUIFrame {
 			if (writer == null)
 				return false;
 			AltosFlightSeries series = make_series(set);
+			series.finish();
 			writer.write(series);
 			writer.close();
 			return true;
 		}
 	}
 
-	static AltosRecordSet record_set(File file) {
-		FileInputStream in;
-		if (file.getName().endsWith("telem")) {
-			try {
-				in = new FileInputStream(file);
-				return new AltosTelemetryFile(in);
-			} catch (Exception e) {
-				System.out.printf("Failed to open file '%s'\n", file);
-			}
-		} else {
-
-			try {
-				AltosEepromFile f = new AltosEepromFile(new FileReader(file));
-				return f;
-			} catch (Exception e) {
-				System.out.printf("Failed to open file '%s'\n", file);
-			}
-		}
-		return null;
-	}
-
 	static AltosReplayReader replay_file(File file) {
 		AltosRecordSet set = record_set(file);
 		if (set == null)
 			return null;
-//		return new AltosReplayReader(states.iterator(), file);
-		return null;
+		return new AltosReplayReader(set, file);
 	}
 
 	static boolean process_replay(File file) {
@@ -510,83 +484,48 @@ public class AltosUI extends AltosUIFrame {
 		AltosRecordSet set = record_set(file);
 		if (set == null)
 			return false;
-		try {
-			System.out.printf("%s:\n", file.toString());
-			AltosFlightSeries series = make_series(set);
-			AltosFlightStats stats = new AltosFlightStats(series);
-			if (stats.serial != AltosLib.MISSING)
-				System.out.printf("Serial:       %5d\n", stats.serial);
-			if (stats.flight != AltosLib.MISSING)
-				System.out.printf("Flight:       %5d\n", stats.flight);
-			if (stats.year != AltosLib.MISSING)
-				System.out.printf("Date:    %04d-%02d-%02d\n",
-						  stats.year, stats.month, stats.day);
-			if (stats.hour != AltosLib.MISSING)
-				System.out.printf("Time:      %02d:%02d:%02d UTC\n",
-						  stats.hour, stats.minute, stats.second);
-			if (stats.max_height != AltosLib.MISSING)
-				System.out.printf("Max height:  %6.0f m    %6.0f ft\n",
-						  stats.max_height,
-						  AltosConvert.meters_to_feet(stats.max_height));
-			if (stats.max_speed != AltosLib.MISSING)
-				System.out.printf("Max speed:   %6.0f m/s  %6.0f ft/s  %6.4f Mach\n",
-						  stats.max_speed,
-						  AltosConvert.meters_to_feet(stats.max_speed),
-						  AltosConvert.meters_to_mach(stats.max_speed));
-			if (stats.max_acceleration != AltosLib.MISSING) {
-				System.out.printf("Max accel:   %6.0f m/s² %6.0f ft/s² %6.2f g\n",
-						  stats.max_acceleration,
-						  AltosConvert.meters_to_feet(stats.max_acceleration),
-						  AltosConvert.meters_to_g(stats.max_acceleration));
-			}
-			if (stats.state_speed[Altos.ao_flight_drogue] != AltosLib.MISSING)
-				System.out.printf("Drogue rate: %6.0f m/s  %6.0f ft/s\n",
-						  stats.state_speed[Altos.ao_flight_drogue],
-						  AltosConvert.meters_to_feet(stats.state_speed[Altos.ao_flight_drogue]));
-			if (stats.state_speed[Altos.ao_flight_main] != AltosLib.MISSING)
-				System.out.printf("Main rate:   %6.0f m/s  %6.0f ft/s\n",
-						  stats.state_speed[Altos.ao_flight_main],
-						  AltosConvert.meters_to_feet(stats.state_speed[Altos.ao_flight_main]));
-			if (stats.state_end[Altos.ao_flight_main] != AltosLib.MISSING &&
-			    stats.state_start[Altos.ao_flight_boost] != AltosLib.MISSING)
-				System.out.printf("Flight time: %6.0f s\n",
-						  stats.state_end[Altos.ao_flight_main] -
-						  stats.state_start[Altos.ao_flight_boost]);
-			System.out.printf("\n");
-			return true;
-		} catch (InterruptedException ie) {
-		} catch (IOException ie) {
-		}
-		return false;
-	}
-
-	static boolean process_cat(File file) {
-		try {
-			AltosRecordSet set = record_set(file);
-
-//			for (AltosState state : eef) {
-//				if ((state.set & AltosState.set_gps) != 0) {
-//					System.out.printf ("time %d %d-%d-%d %d:%d:%d lat %g lon %g alt %g\n",
-//							   state.gps.seconds(),
-//							   state.gps.year,
-//							   state.gps.month,
-//							   state.gps.day,
-//							   state.gps.hour,
-//							   state.gps.minute,
-//							   state.gps.second,
-//							   state.gps.lat,
-//							   state.gps.lon,
-//							   state.gps.alt);
-//				} else {
-//					System.out.printf ("tick %d state %d height %g\n",
-//							   state.tick, state.state(), state.height());
-//				}
-//			}
-
-		} catch (Exception e) {
-			System.out.printf("Failed to open file '%s'\n", file);
-			return false;
+		System.out.printf("%s:\n", file.toString());
+		AltosFlightSeries series = make_series(set);
+		AltosFlightStats stats = new AltosFlightStats(series);
+		if (stats.serial != AltosLib.MISSING)
+			System.out.printf("Serial:       %5d\n", stats.serial);
+		if (stats.flight != AltosLib.MISSING)
+			System.out.printf("Flight:       %5d\n", stats.flight);
+		if (stats.year != AltosLib.MISSING)
+			System.out.printf("Date:    %04d-%02d-%02d\n",
+					  stats.year, stats.month, stats.day);
+		if (stats.hour != AltosLib.MISSING)
+			System.out.printf("Time:      %02d:%02d:%02d UTC\n",
+					  stats.hour, stats.minute, stats.second);
+		if (stats.max_height != AltosLib.MISSING)
+			System.out.printf("Max height:  %6.0f m    %6.0f ft\n",
+					  stats.max_height,
+					  AltosConvert.meters_to_feet(stats.max_height));
+		if (stats.max_speed != AltosLib.MISSING)
+			System.out.printf("Max speed:   %6.0f m/s  %6.0f ft/s  %6.4f Mach\n",
+					  stats.max_speed,
+					  AltosConvert.meters_to_feet(stats.max_speed),
+					  AltosConvert.meters_to_mach(stats.max_speed));
+		if (stats.max_acceleration != AltosLib.MISSING) {
+			System.out.printf("Max accel:   %6.0f m/s² %6.0f ft/s² %6.2f g\n",
+					  stats.max_acceleration,
+					  AltosConvert.meters_to_feet(stats.max_acceleration),
+					  AltosConvert.meters_to_g(stats.max_acceleration));
 		}
+		if (stats.state_speed[Altos.ao_flight_drogue] != AltosLib.MISSING)
+			System.out.printf("Drogue rate: %6.0f m/s  %6.0f ft/s\n",
+					  stats.state_speed[Altos.ao_flight_drogue],
+					  AltosConvert.meters_to_feet(stats.state_speed[Altos.ao_flight_drogue]));
+		if (stats.state_speed[Altos.ao_flight_main] != AltosLib.MISSING)
+			System.out.printf("Main rate:   %6.0f m/s  %6.0f ft/s\n",
+					  stats.state_speed[Altos.ao_flight_main],
+					  AltosConvert.meters_to_feet(stats.state_speed[Altos.ao_flight_main]));
+		if (stats.state_end[Altos.ao_flight_main] != AltosLib.MISSING &&
+		    stats.state_start[Altos.ao_flight_boost] != AltosLib.MISSING)
+			System.out.printf("Flight time: %6.0f s\n",
+					  stats.state_end[Altos.ao_flight_main] -
+					  stats.state_start[Altos.ao_flight_boost]);
+		System.out.printf("\n");
 		return true;
 	}
 
@@ -632,8 +571,6 @@ public class AltosUI extends AltosUIFrame {
 					process = process_graph;
 				else if (args[i].equals("--summary"))
 					process = process_summary;
-				else if (args[i].equals("--cat"))
-					process = process_cat;
 				else if (args[i].startsWith("--"))
 					help(1);
 				else {
@@ -662,9 +599,6 @@ public class AltosUI extends AltosUIFrame {
 						if (!process_summary(file))
 							++errors;
 						break;
-					case process_cat:
-						if (!process_cat(file))
-							++errors;
 					}
 				}
 			}