altosui: Remove un-implemented --fetchmaps argument
[fw/altos] / altosui / AltosUI.java
index 0efe27a0b92985eb662948784860979936f6c272..5dd532bd5c312921ea88376c7f73f1c2d5cc85e2 100644 (file)
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altosuilib_6.*;
 
 public class AltosUI extends AltosUIFrame {
        public AltosVoice voice = new AltosVoice();
@@ -48,7 +48,7 @@ public class AltosUI extends AltosUIFrame {
                } 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,
@@ -58,22 +58,26 @@ public class AltosUI extends AltosUIFrame {
                                                      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;
 
@@ -95,10 +99,25 @@ public class AltosUI extends AltosUIFrame {
                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);
 
+               register_for_macosx_events();
+
                AltosUIPreferences.set_component(this);
 
                pane = getContentPane();
@@ -233,7 +252,7 @@ public class AltosUI extends AltosUIFrame {
                });
 
                setLocationByPlatform(false);
-               
+
                /* Insets aren't set before the window is visible */
                setVisible(true);
        }
@@ -272,11 +291,11 @@ public class AltosUI extends AltosUIFrame {
        }
 
        void ScanChannels() {
-               new AltosScanUI(AltosUI.this);
+               new AltosScanUI(AltosUI.this, true);
        }
 
        void LoadMaps() {
-               new AltosSiteMapPreload(AltosUI.this);
+               new AltosUIMapPreload(AltosUI.this);
        }
 
        void LaunchController() {
@@ -290,9 +309,9 @@ public class AltosUI extends AltosUIFrame {
                AltosDataChooser chooser = new AltosDataChooser(
                        AltosUI.this);
 
-               AltosRecordIterable iterable = chooser.runDialog();
-               if (iterable != null) {
-                       AltosFlightReader reader = new AltosReplayReader(iterable.iterator(),
+               Iterable<AltosState> states = chooser.runDialog();
+               if (states != null) {
+                       AltosFlightReader reader = new AltosReplayReader(states.iterator(),
                                                                         chooser.file());
                        new AltosFlightUI(voice, reader);
                }
@@ -302,7 +321,7 @@ public class AltosUI extends AltosUIFrame {
         * a TeleDongle over the packet link
         */
        private void SaveFlightData() {
-               new AltosEepromManage(AltosUI.this);
+               new AltosEepromManage(AltosUI.this, AltosLib.product_any);
        }
 
        /* Load a flight log file and write out a CSV file containing
@@ -312,10 +331,10 @@ public class AltosUI extends AltosUIFrame {
        private void ExportData() {
                AltosDataChooser chooser;
                chooser = new AltosDataChooser(this);
-               AltosRecordIterable record_reader = chooser.runDialog();
-               if (record_reader == null)
+               AltosStateIterable states = chooser.runDialog();
+               if (states == null)
                        return;
-               new AltosCSVUI(AltosUI.this, record_reader, chooser.file());
+               new AltosCSVUI(AltosUI.this, states, chooser.file());
        }
 
        /* Load a flight log CSV file and display a pretty graph.
@@ -324,11 +343,11 @@ public class AltosUI extends AltosUIFrame {
        private void GraphData() {
                AltosDataChooser chooser;
                chooser = new AltosDataChooser(this);
-               AltosRecordIterable record_reader = chooser.runDialog();
-               if (record_reader == null)
+               AltosStateIterable states = chooser.runDialog();
+               if (states == null)
                        return;
                try {
-                       new AltosGraphUI(record_reader, chooser.filename());
+                       new AltosGraphUI(states, chooser.file());
                } catch (InterruptedException ie) {
                } catch (IOException ie) {
                }
@@ -345,26 +364,22 @@ public class AltosUI extends AltosUIFrame {
                }
        }
 
-       static AltosRecordIterable open_logfile(String filename) {
-               File file = new File (filename);
+       static AltosStateIterable open_logfile(File file) {
                try {
                        FileInputStream in;
 
                        in = new FileInputStream(file);
-                       if (filename.endsWith("eeprom"))
-                               return new AltosEepromIterable(in);
-                       else if (filename.endsWith("mega"))
-                               return new AltosEepromMegaIterable(in);
+                       if (file.getName().endsWith("telem"))
+                               return new AltosTelemetryFile(in);
                        else
-                               return new AltosTelemetryIterable(in);
+                               return new AltosEepromFile(in);
                } 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_csv(File file) {
                try {
                        return new AltosCSV(file);
                } catch (FileNotFoundException fe) {
@@ -373,8 +388,7 @@ public class AltosUI extends AltosUIFrame {
                }
        }
 
-       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) {
@@ -389,13 +403,14 @@ public class AltosUI extends AltosUIFrame {
        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(String input) {
-               AltosRecordIterable iterable = open_logfile(input);
-               if (iterable == null)
+       static boolean process_csv(File input) {
+               AltosStateIterable states = open_logfile(input);
+               if (states == 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);
@@ -404,18 +419,18 @@ public class AltosUI extends AltosUIFrame {
                        AltosWriter writer = open_csv(output);
                        if (writer == null)
                                return false;
-                       writer.write(iterable);
+                       writer.write(states);
                        writer.close();
                }
                return true;
        }
 
-       static boolean process_kml(String input) {
-               AltosRecordIterable iterable = open_logfile(input);
-               if (iterable == null)
+       static boolean process_kml(File input) {
+               AltosStateIterable states = open_logfile(input);
+               if (states == 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);
@@ -424,13 +439,13 @@ public class AltosUI extends AltosUIFrame {
                        AltosWriter writer = open_kml(output);
                        if (writer == null)
                                return false;
-                       writer.write(iterable);
+                       writer.write(states);
                        writer.close();
                        return true;
                }
        }
 
-       static AltosRecordIterable record_iterable(File file) {
+       static AltosStateIterable record_iterable(File file) {
                FileInputStream in;
                try {
                        in = new FileInputStream(file);
@@ -438,57 +453,46 @@ public class AltosUI extends AltosUIFrame {
                        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 if (file.getName().endsWith("mega")) {
-                       recs = new AltosEepromMegaIterable(in);
-               } else {
-                       recs = new AltosTelemetryIterable(in);
-               }
-               return recs;
+               if (file.getName().endsWith("telem"))
+                       return new AltosTelemetryFile(in);
+               else
+                       return new AltosEepromFile(in);
        }
 
-       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) {
+               AltosStateIterable states = record_iterable(file);
+               if (states == null)
                        return null;
-               return new AltosReplayReader(recs.iterator(), new File(filename));
+               return new AltosReplayReader(states.iterator(), file);
        }
 
-       static boolean 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 boolean process_graph(String filename) {
-               AltosRecordIterable recs = record_iterable_file(filename);
-               if (recs == null)
+       static boolean process_graph(File file) {
+               AltosStateIterable states = record_iterable(file);
+               if (states == null)
                        return false;
                try {
-                       new AltosGraphUI(recs, filename);
+                       new AltosGraphUI(states, file);
                        return true;
                } catch (InterruptedException ie) {
                } catch (IOException ie) {
                }
                return false;
        }
-       
-       static boolean process_summary(String filename) {
-               AltosRecordIterable iterable = record_iterable_file(filename);
-               if (iterable == null)
+
+       static boolean process_summary(File file) {
+               AltosStateIterable states = record_iterable(file);
+               if (states == null)
                        return false;
                try {
-                       AltosFlightStats stats = new AltosFlightStats(iterable);
+                       AltosFlightStats stats = new AltosFlightStats(states);
                        if (stats.serial > 0)
                                System.out.printf("Serial:       %5d\n", stats.serial);
                        if (stats.flight > 0)
@@ -506,18 +510,18 @@ public class AltosUI extends AltosUIFrame {
                                          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_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]));
+                                         stats.state_speed[Altos.ao_flight_drogue],
+                                         AltosConvert.meters_to_feet(stats.state_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]));
+                                         stats.state_speed[Altos.ao_flight_main],
+                                         AltosConvert.meters_to_feet(stats.state_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]);
@@ -528,17 +532,40 @@ public class AltosUI extends AltosUIFrame {
                return false;
        }
 
+       static boolean process_cat(File file) {
+               try {
+                       AltosStateIterable eef = record_iterable(file);
+
+                       System.out.printf ("process cat\n");
+                       for (AltosState state : eef) {
+                               System.out.printf ("tick %d state %d height %g\n",
+                                                  state.tick, state.state, state.height());
+                               if ((state.set & AltosState.set_gps) != 0)
+                                       System.out.printf ("time %g lat %g lon %g alt %g\n",
+                                                          state.time_since_boost(),
+                                                          state.gps.lat,
+                                                          state.gps.lon,
+                                                          state.gps.alt);
+                       }
+
+               } catch (Exception e) {
+                       System.out.printf("Failed to open file '%s'\n", file);
+                       return false;
+               }
+               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 <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);
@@ -546,28 +573,21 @@ public class AltosUI extends AltosUIFrame {
                        UIManager.setLookAndFeel(AltosUIPreferences.look_and_feel());
                } catch (Exception e) {
                }
+               AltosUI altosui = null;
+
                /* Handle batch-mode */
                if (args.length == 0) {
-                       AltosUI altosui = new AltosUI();
-
+                       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;
@@ -577,31 +597,41 @@ 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 {
+                                       File file = new File(args[i]);
                                        switch (process) {
                                        case process_none:
                                        case process_graph:
-                                               if (!process_graph(args[i]))
+                                               if (altosui == null)
+                                                       altosui = new AltosUI();
+                                               if (!process_graph(file))
                                                        ++errors;
                                                break;
                                        case process_replay:
-                                               if (!process_replay(args[i]))
+                                               if (altosui == null)
+                                                       altosui = new AltosUI();
+                                               if (!process_replay(file))
                                                        ++errors;
                                                break;
                                        case process_kml:
-                                               if (!process_kml(args[i]))
+                                               if (!process_kml(file))
                                                        ++errors;
                                                break;
                                        case process_csv:
-                                               if (!process_csv(args[i]))
+                                               if (!process_csv(file))
                                                        ++errors;
                                                break;
                                        case process_summary:
-                                               if (!process_summary(args[i]))
+                                               if (!process_summary(file))
                                                        ++errors;
                                                break;
+                                       case process_cat:
+                                               if (!process_cat(file))
+                                                       ++errors;
                                        }
                                }
                        }