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
private static AltosFlightSeries make_series(AltosRecordSet set) {
AltosFlightSeries series = new AltosFlightSeries(set.cal_data());
set.capture_series(series);
+ series.finish();
return series;
}
}
}
- 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);
}
}
+ 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_summary = 5;
static boolean process_csv(File input) {
- AltosRecordSet set = open_logfile(input);
+ AltosRecordSet set = record_set(input);
if (set == null)
return false;
}
static boolean process_kml(File input) {
- AltosRecordSet set = open_logfile(input);
+ AltosRecordSet set = record_set(input);
if (set == null)
return false;
}
}
- 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)