X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosUI.java;h=1c18dbb19a8a9626299fd80ed4a133a659104d63;hp=6993abab92ae2e49bb03cf621f537b56e50f065a;hb=f972000642f9c9835a0b7d14155d4c5695455d94;hpb=bdfcc9112c41c494de23594963980a730b625cc4 diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index 6993abab..1c18dbb1 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -3,7 +3,8 @@ * * 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. + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. * * This program is distributed in the hope that it will be useful, but * WITHOUT ANY WARRANTY; without even the implied warranty of @@ -20,17 +21,12 @@ package altosui; import java.awt.*; import java.awt.event.*; import javax.swing.*; -import javax.swing.filechooser.FileNameExtensionFilter; -import javax.swing.table.*; import java.io.*; -import java.util.*; -import java.text.*; -import java.util.prefs.*; import java.util.concurrent.*; +import org.altusmetrum.altoslib_12.*; +import org.altusmetrum.altosuilib_12.*; -import libaltosJNI.*; - -public class AltosUI extends AltosFrame { +public class AltosUI extends AltosUIFrame { public AltosVoice voice = new AltosVoice(); public static boolean load_library(Frame frame) { @@ -47,13 +43,13 @@ public class AltosUI extends AltosFrame { void telemetry_window(AltosDevice device) { try { - AltosFlightReader reader = new AltosTelemetryReader(device); + AltosFlightReader reader = new AltosTelemetryReader(new AltosSerial(device)); if (reader != null) new AltosFlightUI(voice, reader, device.getSerial()); } catch (FileNotFoundException ee) { JOptionPane.showMessageDialog(AltosUI.this, ee.getMessage(), - "Cannot open target device", + String.format ("Cannot open %s", device.toShortString()), JOptionPane.ERROR_MESSAGE); } catch (AltosSerialInUseException si) { JOptionPane.showMessageDialog(AltosUI.this, @@ -63,22 +59,26 @@ public class AltosUI extends AltosFrame { JOptionPane.ERROR_MESSAGE); } catch (IOException ee) { JOptionPane.showMessageDialog(AltosUI.this, - device.toShortString(), - "Unkonwn I/O error", + String.format ("Unknown I/O error on %s", device.toShortString()), + "Unknown I/O error", JOptionPane.ERROR_MESSAGE); } catch (TimeoutException te) { JOptionPane.showMessageDialog(this, - device.toShortString(), + String.format ("Timeout on %s", device.toShortString()), "Timeout error", JOptionPane.ERROR_MESSAGE); } catch (InterruptedException ie) { JOptionPane.showMessageDialog(this, - device.toShortString(), + String.format("Interrupted %s", device.toShortString()), "Interrupted exception", JOptionPane.ERROR_MESSAGE); } } + public void scan_device_selected(AltosDevice device) { + telemetry_window(device); + } + Container pane; GridBagLayout gridbag; @@ -93,22 +93,33 @@ public class AltosUI extends AltosFrame { c.weighty = 1; b = new JButton(label); - Dimension ps = b.getPreferredSize(); + //Dimension ps = b.getPreferredSize(); gridbag.setConstraints(b, c); add(b, c); return b; } + /* OSXAdapter interfaces */ + public void macosx_file_handler(String path) { + process_graph(new File(path)); + } + + public void macosx_quit_handler() { + System.exit(0); + } + + public void macosx_preferences_handler() { + ConfigureAltosUI(); + } + public AltosUI() { load_library(null); - java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg"); - if (imgURL != null) - setIconImage(new ImageIcon(imgURL).getImage()); + register_for_macosx_events(); - AltosPreferences.set_component(this); + AltosUIPreferences.set_component(this); pane = getContentPane(); gridbag = new GridBagLayout(); @@ -233,14 +244,6 @@ public class AltosUI extends AltosFrame { doLayout(); validate(); - setVisible(true); - - Insets i = getInsets(); - Dimension ps = rootPane.getPreferredSize(); - ps.width += i.left + i.right; - ps.height += i.top + i.bottom; - setPreferredSize(ps); - setSize(ps); setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); addWindowListener(new WindowAdapter() { @Override @@ -248,10 +251,15 @@ public class AltosUI extends AltosFrame { System.exit(0); } }); + + setLocationByPlatform(false); + + /* Insets aren't set before the window is visible */ + setVisible(true); } private void ConnectToDevice() { - AltosDevice device = AltosDeviceDialog.show(AltosUI.this, + AltosDevice device = AltosDeviceUIDialog.show(AltosUI.this, Altos.product_basestation); if (device != null) @@ -262,13 +270,13 @@ public class AltosUI extends AltosFrame { String result; result = JOptionPane.showInputDialog(AltosUI.this, "Configure Callsign", - AltosPreferences.callsign()); + AltosUIPreferences.callsign()); if (result != null) - AltosPreferences.set_callsign(result); + AltosUIPreferences.set_callsign(result); } void ConfigureTeleMetrum() { - new AltosConfig(AltosUI.this); + new AltosConfigFC(AltosUI.this); } void ConfigureTeleDongle() { @@ -284,11 +292,11 @@ public class AltosUI extends AltosFrame { } void ScanChannels() { - new AltosScanUI(AltosUI.this); + new AltosScanUI(AltosUI.this, true); } void LoadMaps() { - new AltosSiteMapPreload(AltosUI.this); + new AltosUIMapPreload(AltosUI.this); } void LaunchController() { @@ -302,10 +310,9 @@ public class AltosUI extends AltosFrame { AltosDataChooser chooser = new AltosDataChooser( AltosUI.this); - AltosRecordIterable iterable = chooser.runDialog(); - if (iterable != null) { - AltosFlightReader reader = new AltosReplayReader(iterable.iterator(), - chooser.file()); + AltosRecordSet set = chooser.runDialog(); + if (set != null) { + AltosReplayReader reader = new AltosReplayReader(set, chooser.file()); new AltosFlightUI(voice, reader); } } @@ -314,7 +321,14 @@ public class AltosUI extends AltosFrame { * a TeleDongle over the packet link */ private void SaveFlightData() { - new AltosEepromManage(AltosUI.this); + new AltosEepromManage(AltosUI.this, AltosLib.product_any); + } + + private static AltosFlightSeries make_series(AltosRecordSet set) { + AltosFlightSeries series = new AltosFlightSeries(set.cal_data()); + set.capture_series(series); + series.finish(); + return series; } /* Load a flight log file and write out a CSV file containing @@ -324,10 +338,11 @@ public class AltosUI extends AltosFrame { private void ExportData() { AltosDataChooser chooser; chooser = new AltosDataChooser(this); - AltosRecordIterable record_reader = chooser.runDialog(); - if (record_reader == null) + AltosRecordSet set = chooser.runDialog(); + if (set == null) return; - new AltosCSVUI(AltosUI.this, record_reader, chooser.file()); + AltosFlightSeries series = make_series(set); + new AltosCSVUI(AltosUI.this, series, chooser.file()); } /* Load a flight log CSV file and display a pretty graph. @@ -336,11 +351,11 @@ public class AltosUI extends AltosFrame { private void GraphData() { AltosDataChooser chooser; chooser = new AltosDataChooser(this); - AltosRecordIterable record_reader = chooser.runDialog(); - if (record_reader == null) + AltosRecordSet set = chooser.runDialog(); + if (set == null) return; try { - new AltosGraphUI(record_reader, chooser.filename()); + new AltosGraphUI(set, chooser.file()); } catch (InterruptedException ie) { } catch (IOException ie) { } @@ -357,40 +372,34 @@ public class AltosUI extends AltosFrame { } } - static AltosRecordIterable open_logfile(String filename) { - File file = new File (filename); + static AltosWriter open_csv(File file) { try { - FileInputStream in; - - in = new FileInputStream(file); - if (filename.endsWith("eeprom")) - return new AltosEepromIterable(in); - else - return new AltosTelemetryIterable(in); + return new AltosCSV(file); } catch (FileNotFoundException fe) { System.out.printf("%s\n", fe.getMessage()); return null; } } - static AltosWriter open_csv(String filename) { - File file = new File (filename); + static AltosWriter open_kml(File file) { try { - return new AltosCSV(file); + return new AltosKML(file); } catch (FileNotFoundException fe) { System.out.printf("%s\n", fe.getMessage()); return null; } } - static AltosWriter open_kml(String filename) { - File file = new File (filename); + static AltosRecordSet record_set(File input) { try { - return new AltosKML(file); - } catch (FileNotFoundException fe) { - System.out.printf("%s\n", fe.getMessage()); - return null; + 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; @@ -399,169 +408,190 @@ public class AltosUI extends AltosFrame { static final int process_graph = 3; static final int process_replay = 4; static final int process_summary = 5; + static final int process_oneline = 6; - static void process_csv(String input) { - AltosRecordIterable iterable = open_logfile(input); - if (iterable == null) - return; + static boolean process_csv(File input) { + AltosRecordSet set = record_set(input); + if (set == null) + return false; - String output = Altos.replace_extension(input,".csv"); + File output = Altos.replace_extension(input,".csv"); System.out.printf("Processing \"%s\" to \"%s\"\n", input, output); if (input.equals(output)) { System.out.printf("Not processing '%s'\n", input); + return false; } else { AltosWriter writer = open_csv(output); if (writer == null) - return; - writer.write(iterable); + return false; + AltosFlightSeries series = make_series(set); + writer.write(series); writer.close(); } + return true; } - static void process_kml(String input) { - AltosRecordIterable iterable = open_logfile(input); - if (iterable == null) - return; + static boolean process_kml(File input) { + AltosRecordSet set = record_set(input); + if (set == null) + return false; - String output = Altos.replace_extension(input,".kml"); + File output = Altos.replace_extension(input,".kml"); System.out.printf("Processing \"%s\" to \"%s\"\n", input, output); if (input.equals(output)) { System.out.printf("Not processing '%s'\n", input); + return false; } else { AltosWriter writer = open_kml(output); if (writer == null) - return; - writer.write(iterable); + return false; + AltosFlightSeries series = make_series(set); + series.finish(); + writer.write(series); writer.close(); + return true; } } - static AltosRecordIterable record_iterable(File file) { - FileInputStream in; - try { - in = new FileInputStream(file); - } catch (Exception e) { - System.out.printf("Failed to open file '%s'\n", file); - return null; - } - AltosRecordIterable recs; - AltosReplayReader reader; - if (file.getName().endsWith("eeprom")) { - recs = new AltosEepromIterable(in); - } else { - recs = new AltosTelemetryIterable(in); - } - return recs; - } - - static AltosRecordIterable record_iterable_file(String filename) { - return record_iterable (new File(filename)); - } - - static AltosReplayReader replay_file(String filename) { - AltosRecordIterable recs = record_iterable_file(filename); - if (recs == null) + static AltosReplayReader replay_file(File file) { + AltosRecordSet set = record_set(file); + if (set == null) return null; - return new AltosReplayReader(recs.iterator(), new File(filename)); + return new AltosReplayReader(set, file); } - static void process_replay(String filename) { - AltosReplayReader reader = replay_file(filename); + static boolean process_replay(File file) { + AltosReplayReader reader = replay_file(file); + if (reader == null) + return false; AltosFlightUI flight_ui = new AltosFlightUI(new AltosVoice(), reader); - flight_ui.set_exit_on_close(); + return true; } - static void process_graph(String filename) { - AltosRecordIterable recs = record_iterable_file(filename); - if (recs == null) - return; + static boolean process_graph(File file) { + AltosRecordSet set = record_set(file); + if (set == null) + return false; try { - new AltosGraphUI(recs, filename); + new AltosGraphUI(set, file); + return true; } catch (InterruptedException ie) { } catch (IOException ie) { } + return false; } - - static void process_summary(String filename) { - AltosRecordIterable iterable = record_iterable_file(filename); - try { - AltosFlightStats stats = new AltosFlightStats(iterable); - if (stats.serial > 0) - System.out.printf("Serial: %5d\n", stats.serial); - if (stats.flight > 0) - System.out.printf("Flight: %5d\n", stats.flight); - if (stats.year > 0) - System.out.printf("Date: %04d-%02d-%02d\n", - stats.year, stats.month, stats.day); - if (stats.hour > 0) - System.out.printf("Time: %02d:%02d:%02d UTC\n", - stats.hour, stats.minute, stats.second); + + static boolean process_summary(File file) { + AltosRecordSet set = record_set(file); + if (set == null) + 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 != AltosRecord.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.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_baro_speed[Altos.ao_flight_drogue], - AltosConvert.meters_to_feet(stats.state_baro_speed[Altos.ao_flight_drogue])); + 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_baro_speed[Altos.ao_flight_main], - AltosConvert.meters_to_feet(stats.state_baro_speed[Altos.ao_flight_main])); + stats.state_speed[Altos.ao_flight_main], + AltosConvert.meters_to_feet(stats.state_speed[Altos.ao_flight_main])); + if (stats.landed_time != AltosLib.MISSING && + stats.boost_time != AltosLib.MISSING && + stats.landed_time > stats.boost_time) System.out.printf("Flight time: %6.0f s\n", - stats.state_end[Altos.ao_flight_main] - - stats.state_start[Altos.ao_flight_boost]); - } catch (InterruptedException ie) { - } catch (IOException ie) { - } + stats.landed_time - + stats.boost_time); + System.out.printf("\n"); + return true; + } + + static boolean process_oneline(File file) { + AltosRecordSet set = record_set(file); + if (set == null) + return false; + System.out.printf("%s:", 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(" height: %6.0f m", stats.max_height); + if (stats.max_speed != AltosLib.MISSING) + System.out.printf(" speed: %6.0f m/s", stats.max_speed); + if (stats.max_acceleration != AltosLib.MISSING) + System.out.printf(" accel: %6.0f m/s²", stats.max_acceleration); + System.out.printf("\n"); + return true; } public static void help(int code) { System.out.printf("Usage: altosui [OPTION]... [FILE]...\n"); System.out.printf(" Options:\n"); - System.out.printf(" --fetchmaps \tpre-fetch maps for site map view\n"); System.out.printf(" --replay \t\trelive the glory of past flights \n"); System.out.printf(" --graph \t\tgraph a flight\n"); + System.out.printf(" --summary \t\tText summary of a flight\n"); + System.out.printf(" --oneline \t\tOne line summary of a flight\n"); System.out.printf(" --csv\tgenerate comma separated output for spreadsheets, etc\n"); System.out.printf(" --kml\tgenerate KML output for use with Google Earth\n"); System.exit(code); } - + public static void main(final String[] args) { + int errors = 0; + load_library(null); try { - UIManager.setLookAndFeel(AltosPreferences.look_and_feel()); + UIManager.setLookAndFeel(AltosUIPreferences.look_and_feel()); } catch (Exception e) { } + AltosUI altosui = null; + /* Handle batch-mode */ if (args.length == 0) { - AltosUI altosui = new AltosUI(); - altosui.setVisible(true); - + altosui = new AltosUI(); java.util.List devices = AltosUSBDevice.list(Altos.product_basestation); - for (AltosDevice device : devices) - altosui.telemetry_window(device); + if (devices != null) + for (AltosDevice device : devices) + altosui.telemetry_window(device); } else { int process = process_none; for (int i = 0; i < args.length; i++) { if (args[i].equals("--help")) help(0); - else if (args[i].equals("--fetchmaps")) { - if (args.length < i + 3) { - help(1); - } else { - double lat = Double.parseDouble(args[i+1]); - double lon = Double.parseDouble(args[i+2]); - AltosSiteMap.prefetchMaps(lat, lon, 5, 5); - i += 2; - } - } else if (args[i].equals("--replay")) + else if (args[i].equals("--replay")) process = process_replay; else if (args[i].equals("--kml")) process = process_kml; @@ -571,29 +601,45 @@ public class AltosUI extends AltosFrame { process = process_graph; else if (args[i].equals("--summary")) process = process_summary; + else if (args[i].equals("--oneline")) + process = process_oneline; else if (args[i].startsWith("--")) help(1); else { + File file = new File(args[i]); switch (process) { case process_none: + if (altosui == null) + altosui = new AltosUI(); case process_graph: - process_graph(args[i]); + if (!process_graph(file)) + ++errors; break; case process_replay: - process_replay(args[i]); + if (!process_replay(file)) + ++errors; break; case process_kml: - process_kml(args[i]); + if (!process_kml(file)) + ++errors; break; case process_csv: - process_csv(args[i]); + if (!process_csv(file)) + ++errors; break; case process_summary: - process_summary(args[i]); + if (!process_summary(file)) + ++errors; + break; + case process_oneline: + if (!process_oneline(file)) + ++errors; break; } } } } + if (errors != 0) + System.exit(errors); } }