altosui: Remove the dregs of AltosDroid load-old-telem code

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 72b2c0d9869cd71e62a7a6a0ce374968427505b8..918ed11e0094f51e2f456af3b3f14b16a240fdf3 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class AltosUI extends AltosUIFrame {
        public AltosVoice voice = new AltosVoice();
@@ -74,6 +74,10 @@ public class AltosUI extends AltosUIFrame {
                }
        }
 
+       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() {
@@ -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
@@ -350,10 +369,10 @@ public class AltosUI extends AltosUIFrame {
                        FileInputStream in;
 
                        in = new FileInputStream(file);
-                       if (file.getName().endsWith("eeprom"))
-                               return new AltosEepromFile(in);
+                       if (file.getName().endsWith("telem"))
+                               return new AltosTelemetryFile(in);
                        else
-                               return null; // new AltosTelemetryIterable(in);
+                               return new AltosEepromFile(in);
                } catch (FileNotFoundException fe) {
                        System.out.printf("%s\n", fe.getMessage());
                        return null;
@@ -434,11 +453,10 @@ public class AltosUI extends AltosUIFrame {
                        System.out.printf("Failed to open file '%s'\n", file);
                        return null;
                }
-               if (file.getName().endsWith("eeprom")) {
-                       return new AltosEepromFile(in);
-               } else {
+               if (file.getName().endsWith("telem"))
                        return new AltosTelemetryFile(in);
-               }
+               else
+                       return new AltosEepromFile(in);
        }
 
        static AltosReplayReader replay_file(File file) {
@@ -453,7 +471,6 @@ public class AltosUI extends AltosUIFrame {
                if (reader == null)
                        return false;
                AltosFlightUI flight_ui = new AltosFlightUI(new AltosVoice(), reader);
-               flight_ui.set_exit_on_close();
                return true;
        }
 
@@ -469,7 +486,7 @@ public class AltosUI extends AltosUIFrame {
                }
                return false;
        }
-       
+
        static boolean process_summary(File file) {
                AltosStateIterable states = record_iterable(file);
                if (states == null)
@@ -493,7 +510,7 @@ 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),
@@ -521,6 +538,8 @@ public class AltosUI extends AltosUIFrame {
 
                        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(),
@@ -539,14 +558,14 @@ public class AltosUI extends AltosUIFrame {
        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);
@@ -554,13 +573,15 @@ 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++) {
@@ -572,7 +593,7 @@ public class AltosUI extends AltosUIFrame {
                                        } else {
                                                double lat = Double.parseDouble(args[i+1]);
                                                double lon = Double.parseDouble(args[i+2]);
-                                               AltosSiteMap.prefetchMaps(lat, lon, 5, 5);
+//                                             AltosSiteMap.prefetchMaps(lat, lon);
                                                i += 2;
                                        }
                                } else if (args[i].equals("--replay"))
@@ -594,10 +615,14 @@ public class AltosUI extends AltosUIFrame {
                                        switch (process) {
                                        case process_none:
                                        case process_graph:
+                                               if (altosui == null)
+                                                       altosui = new AltosUI();
                                                if (!process_graph(file))
                                                        ++errors;
                                                break;
                                        case process_replay:
+                                               if (altosui == null)
+                                                       altosui = new AltosUI();
                                                if (!process_replay(file))
                                                        ++errors;
                                                break;