telegps: Add info table

[fw/altos] / telegps / TeleGPS.java

diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index 1bb505e03c068e102e1a1551bce205c3750d0681..d30d8dc53e632b6e98d4a75ec295275501fab4e3 100644 (file)
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -50,16 +50,25 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
        AltosFlightReader       reader;
        AltosDisplayThread      thread;
 
-       JTabbedPane     pane;
+       JMenuBar                menu_bar;
 
-       AltosSiteMap    sitemap;
-       TeleGPSInfo     gps_info;
-       boolean         has_map;
+       JMenu                   file_menu;
+       JMenu                   monitor_menu;
+       JMenu                   device_menu;
+       AltosFreqList           frequencies;
+
+       Container               bag;
 
-       JMenuBar        menu_bar;
-       JMenu           file_menu;
-       JMenu           monitor_menu;
-       JMenu           device_menu;
+       TeleGPSStatus           telegps_status;
+       TeleGPSStatusUpdate     status_update;
+
+       JTabbedPane             pane;
+
+       AltosSiteMap            sitemap;
+       TeleGPSInfo             gps_info;
+       AltosInfoTable          info_table;
+
+       LinkedList<AltosFlightDisplay>  displays;
 
        /* File menu */
        final static String     new_command = "new";
@@ -89,21 +98,19 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
 
        /* Device menu */
        final static String     download_command = "download";
-       final static String     configure_command = "configure";
        final static String     export_command = "export";
        final static String     graph_command = "graph";
+       final static String     configure_command = "configure";
+       final static String     flash_command = "flash";
 
        static final String[][] device_menu_entries = new String[][] {
                { "Download Data",      download_command },
                { "Configure Device",   configure_command },
                { "Export Data",        export_command },
                { "Graph Data",         graph_command },
+               { "Flash Device",       flash_command },
        };
 
-//     private AltosInfoTable flightInfo;
-
-       boolean exit_on_close = false;
-
        void stop_display() {
                if (thread != null && thread.isAlive()) {
                        thread.interrupt();
@@ -115,41 +122,38 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
        }
 
        public void reset() {
-               sitemap.reset();
-               gps_info.reset();
+               for (AltosFlightDisplay display : displays)
+                       display.reset();
        }
 
        public void set_font() {
-               sitemap.set_font();
-               gps_info.set_font();
+               for (AltosFlightDisplay display : displays)
+                       display.set_font();
        }
 
        public void font_size_changed(int font_size) {
                set_font();
        }
 
-
-//     AltosFlightStatusUpdate status_update;
-
        public void show(AltosState state, AltosListenerState listener_state) {
-//             status_update.saved_state = state;
+               try {
+                       status_update.saved_state = state;
 
-               if (state == null)
-                       state = new AltosState();
+                       if (state == null)
+                               state = new AltosState();
 
-               sitemap.show(state, listener_state);
-               gps_info.show(state, listener_state);
-               telegps_status.show(state, listener_state);
+                       int i = 0;
+                       for (AltosFlightDisplay display : displays) {
+                               display.show(state, listener_state);
+                               i++;
+                       }
+               } catch (Exception ex) {
+                       System.out.printf("Exception %s\n", ex.toString());
+                       for (StackTraceElement e : ex.getStackTrace())
+                               System.out.printf("%s\n", e.toString());
+               }
        }
 
-       Container               bag;
-       AltosFreqList           frequencies;
-       JLabel                  telemetry;
-       TeleGPSStatus           telegps_status;
-       TeleGPSStatusUpdate     status_update;
-
-       ActionListener          show_timer;
-
        void new_window() {
                new TeleGPS();
        }
@@ -240,6 +244,10 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
        void graph() {
        }
 
+       void flash() {
+               AltosFlashUI.show(this);
+       }
+
        public void actionPerformed(ActionEvent ev) {
 
                /* File menu */
@@ -293,6 +301,10 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
                        graph();
                        return;
                }
+               if (flash_command.equals(ev.getActionCommand())) {
+                       flash();
+                       return;
+               }
        }
 
        void add_frequency_menu(int serial, final AltosFlightReader reader) {
@@ -373,6 +385,7 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
                file_menu = make_menu("File", file_menu_entries);
                monitor_menu = make_menu("Monitor", monitor_menu_entries);
                device_menu = make_menu("Device", device_menu_entries);
+               displays = new LinkedList<AltosFlightDisplay>();
 
                int serial = -1;
 
@@ -385,6 +398,7 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
                c.gridwidth = 2;
                bag.add(telegps_status, c);
                c.gridwidth = 1;
+               displays.add(telegps_status);
 
 
                /* The rest of the window uses a tabbed pane to
@@ -403,9 +417,15 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
 
                sitemap = new AltosSiteMap();
                pane.add("Site Map", sitemap);
+               displays.add(sitemap);
 
                gps_info = new TeleGPSInfo();
                pane.add("Info", gps_info);
+               displays.add(gps_info);
+
+               info_table = new AltosInfoTable();
+               pane.add("Table", info_table);
+               displays.add(info_table);
 
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
@@ -433,6 +453,11 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
                set_reader(reader);
        }
 
+       public TeleGPS(AltosDevice device) {
+               this();
+               connect(device);
+       }
+
        static AltosStateIterable record_iterable(File file) {
                FileInputStream in;
                try {
@@ -562,7 +587,15 @@ public class TeleGPS extends AltosUIFrame implements AltosFlightDisplay, AltosFo
                }
                if (errors != 0)
                        System.exit(errors);
-               if (!any_created)
-                       new TeleGPS();
+               if (!any_created) {
+                       java.util.List<AltosDevice> devices = AltosUSBDevice.list(AltosLib.product_basestation);
+                       if (devices != null)
+                               for (AltosDevice device : devices) {
+                                       new TeleGPS(device);
+                                       any_created = true;
+                               }
+                       if (!any_created)
+                               new TeleGPS();
+               }
        }
 }