altosui: Remove --cat mode
[fw/altos] / altosui / AltosUI.java
index 3e5bcf434fc5b8b8276fe2074873e528d8032d74..ac46ae5cc1c10aacffb7294f45703580ee12709c 100644 (file)
@@ -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_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
-import libaltosJNI.*;
-
-public class AltosUI extends JFrame {
+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 JFrame {
 
        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 JFrame {
                                                      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 JFrame {
                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();
@@ -165,28 +176,29 @@ public class AltosUI extends JFrame {
                                }
                        });
                b.setToolTipText("Global AltosUI settings");
-               b = addButton(2, 1, "Flash Image");
+
+               b = addButton(2, 1, "Configure Ground Station");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
-                                       FlashImage();
+                                       ConfigureTeleDongle();
                                }
                        });
-               b.setToolTipText("Replace the firmware in any AltusMetrum product");
 
-               b = addButton(3, 1, "Fire Igniter");
+               b = addButton(3, 1, "Flash Image");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
-                                       FireIgniter();
+                                       FlashImage();
                                }
                        });
-               b.setToolTipText("Remote control of igniters for deployment testing");
-               b = addButton(4, 1, "Quit");
+               b.setToolTipText("Replace the firmware in any AltusMetrum product");
+
+               b = addButton(4, 1, "Fire Igniter");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
-                                       System.exit(0);
+                                       FireIgniter();
                                }
                        });
-               b.setToolTipText("Close all active windows and terminate AltosUI");
+               b.setToolTipText("Remote control of igniters for deployment testing");
                b = addButton(0, 2, "Scan Channels");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
@@ -209,12 +221,20 @@ public class AltosUI extends JFrame {
                        });
                b.setToolTipText("Check flight readiness of altimeter in idle mode");
 
-               b = addButton(3, 2, "Launch Controller");
+//             b = addButton(3, 2, "Launch Controller");
+//             b.addActionListener(new ActionListener() {
+//                             public void actionPerformed(ActionEvent e) {
+//                                     LaunchController();
+//                             }
+//                     });
+
+               b = addButton(4, 2, "Quit");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
-                                       LaunchController();
+                                       System.exit(0);
                                }
                        });
+               b.setToolTipText("Close all active windows and terminate AltosUI");
 
                setTitle("AltOS");
 
@@ -224,14 +244,6 @@ public class AltosUI extends JFrame {
                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
@@ -239,10 +251,15 @@ public class AltosUI extends JFrame {
                                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)
@@ -253,15 +270,19 @@ public class AltosUI extends JFrame {
                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);
        }
 
+       void ConfigureTeleDongle() {
+               new AltosConfigTD(AltosUI.this);
+       }
+
        void FlashImage() {
                AltosFlashUI.show(AltosUI.this);
        }
@@ -271,11 +292,11 @@ public class AltosUI extends JFrame {
        }
 
        void ScanChannels() {
-               new AltosScanUI(AltosUI.this);
+               new AltosScanUI(AltosUI.this, true);
        }
 
        void LoadMaps() {
-               new AltosSiteMapPreload(AltosUI.this);
+               new AltosUIMapPreload(AltosUI.this);
        }
 
        void LaunchController() {
@@ -289,19 +310,26 @@ public class AltosUI extends JFrame {
                AltosDataChooser chooser = new AltosDataChooser(
                        AltosUI.this);
 
-               AltosRecordIterable iterable = chooser.runDialog();
-               if (iterable != null) {
-                       AltosFlightReader reader = new AltosReplayReader(iterable.iterator(),
-                                                                        chooser.file());
-                       new AltosFlightUI(voice, reader);
-               }
+               AltosRecordSet set = chooser.runDialog();
+/* XXX fixme */
+//             if (states != null) {
+//                     AltosFlightReader reader = new AltosReplayReader(states.iterator(),
+//                                                                      chooser.file());
+//                     new AltosFlightUI(voice, reader);
+//             }
        }
 
        /* Connect to TeleMetrum, either directly or through
         * 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);
+               return series;
        }
 
        /* Load a flight log file and write out a CSV file containing
@@ -311,10 +339,11 @@ public class AltosUI extends JFrame {
        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, series.cal_data, chooser.file());
        }
 
        /* Load a flight log CSV file and display a pretty graph.
@@ -323,11 +352,11 @@ public class AltosUI extends JFrame {
        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) {
                }
@@ -344,24 +373,22 @@ public class AltosUI extends JFrame {
                }
        }
 
-       static AltosRecordIterable open_logfile(String filename) {
-               File file = new File (filename);
+       static AltosRecordSet open_logfile(File file) {
                try {
-                       FileInputStream in;
-
-                       in = new FileInputStream(file);
-                       if (filename.endsWith("eeprom"))
-                               return new AltosEepromIterable(in);
+                       if (file.getName().endsWith("telem"))
+                               return new AltosTelemetryFile(new FileInputStream(file));
                        else
-                               return new AltosTelemetryIterable(in);
+                               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(String filename) {
-               File file = new File (filename);
+       static AltosWriter open_csv(File file) {
                try {
                        return new AltosCSV(file);
                } catch (FileNotFoundException fe) {
@@ -370,8 +397,7 @@ public class AltosUI extends JFrame {
                }
        }
 
-       static AltosWriter open_kml(String filename) {
-               File file = new File (filename);
+       static AltosWriter open_kml(File file) {
                try {
                        return new AltosKML(file);
                } catch (FileNotFoundException fe) {
@@ -387,164 +413,184 @@ public class AltosUI extends JFrame {
        static final int process_replay = 4;
        static final int process_summary = 5;
 
-       static void process_csv(String input) {
-               AltosRecordIterable iterable = open_logfile(input);
-               if (iterable == null)
-                       return;
+       static boolean process_csv(File input) {
+               AltosRecordSet set = open_logfile(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 = open_logfile(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);
+                       writer.write(series);
                        writer.close();
+                       return true;
                }
        }
 
-       static AltosRecordIterable record_iterable_file(String filename) {
+       static AltosRecordSet record_set(File file) {
                FileInputStream in;
-               try {
-                       in = new FileInputStream(filename);
-               } catch (Exception e) {
-                       System.out.printf("Failed to open file '%s'\n", filename);
-                       return null;
-               }
-               AltosRecordIterable recs;
-               AltosReplayReader reader;
-               if (filename.endsWith("eeprom")) {
-                       recs = new AltosEepromIterable(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 {
-                       recs = new AltosTelemetryIterable(in);
+
+                       try {
+                               AltosEepromFile f = new AltosEepromFile(new FileReader(file));
+                               return f;
+                       } catch (Exception e) {
+                               System.out.printf("Failed to open file '%s'\n", file);
+                       }
                }
-               return recs;
+               return null;
        }
 
-       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) {
-               AltosReplayReader reader = replay_file(filename);
+
+       static boolean process_summary(File file) {
+               AltosRecordSet set = record_set(file);
+               if (set == null)
+                       return false;
                try {
-                       AltosFlightStats stats = new AltosFlightStats(reader);
-                       if (stats.serial > 0)
+                       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 > 0)
+                       if (stats.flight != AltosLib.MISSING)
                                System.out.printf("Flight:       %5d\n", stats.flight);
-                       if (stats.year > 0)
+                       if (stats.year != AltosLib.MISSING)
                                System.out.printf("Date:    %04d-%02d-%02d\n",
                                                  stats.year, stats.month, stats.day);
-                       if (stats.hour > 0)
+                       if (stats.hour != AltosLib.MISSING)
                                System.out.printf("Time:      %02d:%02d:%02d UTC\n",
                                                  stats.hour, stats.minute, stats.second);
-                       System.out.printf("Max height:  %6.0f m    %6.0f ft\n",
-                                         stats.max_height,
-                                         AltosConvert.meters_to_feet(stats.max_height));
-                       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) {
+                       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));
                        }
-                       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]));
-                       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]));
-                       System.out.printf("Flight time: %6.0f s\n",
-                                         stats.state_end[Altos.ao_flight_main] -
-                                         stats.state_start[Altos.ao_flight_boost]);
+                       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;
        }
 
        public static void help(int code) {
                System.out.printf("Usage: altosui [OPTION]... [FILE]...\n");
                System.out.printf("  Options:\n");
-               System.out.printf("    --fetchmaps <lat> <lon>\tpre-fetch maps for site map view\n");
                System.out.printf("    --replay <filename>\t\trelive the glory of past flights \n");
                System.out.printf("    --graph <filename>\t\tgraph a flight\n");
+               System.out.printf("    --summary <filename>\t\tText 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(UIManager.getSystemLookAndFeelClassName());
+                       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<AltosDevice> 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;
@@ -557,26 +603,36 @@ public class AltosUI extends JFrame {
                                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;
                                        }
                                }
                        }
                }
+               if (errors != 0)
+                       System.exit(errors);
        }
 }