altosui: Try to get dialogs to look a little better
[fw/altos] / altosui / AltosFlightUI.java
index 24d25bd7c46a0a4683fc732ce4441711a48a3fed..abe08a182a04d4e6cae8deaf6b1bdad6779cfeea 100644 (file)
@@ -26,12 +26,9 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.*;
 
 public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
-       String[] statusNames = { "Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
-       Object[][] statusData = { { "0", "pad", "-50", "0" } };
-
        AltosVoice              voice;
        AltosFlightReader       reader;
        AltosDisplayThread      thread;
@@ -42,28 +39,25 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
        AltosAscent     ascent;
        AltosDescent    descent;
        AltosLanded     landed;
+       AltosCompanionInfo      companion;
        AltosSiteMap    sitemap;
+       boolean         has_map;
+       boolean         has_companion;
 
        private AltosFlightStatus flightStatus;
        private AltosInfoTable flightInfo;
 
-       static final int tab_pad = 1;
-       static final int tab_ascent = 2;
-       static final int tab_descent = 3;
-       static final int tab_landed = 4;
-
-       int cur_tab = 0;
-
        boolean exit_on_close = false;
 
-       int which_tab(AltosState state) {
+       JComponent cur_tab = null;
+       JComponent which_tab(AltosState state) {
                if (state.state < Altos.ao_flight_boost)
-                       return tab_pad;
+                       return pad;
                if (state.state <= Altos.ao_flight_coast)
-                       return tab_ascent;
+                       return ascent;
                if (state.state <= Altos.ao_flight_main)
-                       return tab_descent;
-               return tab_landed;
+                       return descent;
+               return landed;
        }
 
        void stop_display() {
@@ -90,30 +84,48 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
        }
 
        public void show(AltosState state, int crc_errors) {
-               int     tab = which_tab(state);
+               JComponent tab = which_tab(state);
+               try {
                pad.show(state, crc_errors);
                ascent.show(state, crc_errors);
                descent.show(state, crc_errors);
                landed.show(state, crc_errors);
                if (tab != cur_tab) {
-                       switch (tab) {
-                       case tab_pad:
-                               pane.setSelectedComponent(pad);
-                               break;
-                       case tab_ascent:
-                               pane.setSelectedComponent(ascent);
-                               break;
-                       case tab_descent:
-                               pane.setSelectedComponent(descent);
-                               break;
-                       case tab_landed:
-                               pane.setSelectedComponent(landed);
+                       if (cur_tab == pane.getSelectedComponent()) {
+                               pane.setSelectedComponent(tab);
                        }
                        cur_tab = tab;
                }
                flightStatus.show(state, crc_errors);
                flightInfo.show(state, crc_errors);
-               sitemap.show(state, crc_errors);
+
+               if (state.data.companion != null) {
+                       if (!has_companion) {
+                               pane.add("Companion", companion);
+                               has_companion= true;
+                       }
+                       companion.show(state, crc_errors);
+               } else {
+                       if (has_companion) {
+                               pane.remove(companion);
+                               has_companion = false;
+                       }
+               }
+               if (state.gps != null && state.gps.connected) {
+                       if (!has_map) {
+                               pane.add("Site Map", sitemap);
+                               has_map = true;
+                       }
+                       sitemap.show(state, crc_errors);
+               } else {
+                       if (has_map) {
+                               pane.remove(sitemap);
+                               has_map = false;
+                       }
+               }
+               } catch (Exception e) {
+                       System.out.print("Show exception" + e);
+               }
        }
 
        public void set_exit_on_close() {
@@ -121,10 +133,11 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
        }
 
        Container       bag;
-       JComboBox       channels;
+       AltosFreqList   frequencies;
+       JComboBox       telemetries;
 
        public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-               AltosPreferences.init(this);
+               AltosPreferences.set_component(this);
 
                voice = in_voice;
                reader = in_reader;
@@ -143,17 +156,56 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                /* Stick channel selector at top of table for telemetry monitoring */
                if (serial >= 0) {
                        // Channel menu
-                       channels = new AltosChannelMenu(AltosPreferences.channel(serial));
-                       channels.addActionListener(new ActionListener() {
-                               public void actionPerformed(ActionEvent e) {
-                                       int channel = channels.getSelectedIndex();
-                                       reader.set_channel(channel);
-                               }
+                       frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+                       frequencies.set_product("Monitor");
+                       frequencies.set_serial(serial);
+                       frequencies.addActionListener(new ActionListener() {
+                                       public void actionPerformed(ActionEvent e) {
+                                               double frequency = frequencies.frequency();
+                                               try {
+                                                       reader.set_frequency(frequency);
+                                               } catch (TimeoutException te) {
+                                               } catch (InterruptedException ie) {
+                                               }
+                                               reader.save_frequency();
+                                       }
                        });
                        c.gridx = 0;
                        c.gridy = 0;
+                       c.weightx = 0;
+                       c.weighty = 0;
+                       c.insets = new Insets(3, 3, 3, 3);
+                       c.fill = GridBagConstraints.NONE;
                        c.anchor = GridBagConstraints.WEST;
-                       bag.add (channels, c);
+                       bag.add (frequencies, c);
+
+                       // Telemetry format menu
+                       telemetries = new JComboBox();
+                       for (int i = 1; i <= Altos.ao_telemetry_max; i++)
+                               telemetries.addItem(Altos.telemetry_name(i));
+                       int telemetry = AltosPreferences.telemetry(serial);
+                       if (telemetry <= Altos.ao_telemetry_off ||
+                           telemetry > Altos.ao_telemetry_max)
+                               telemetry = Altos.ao_telemetry_standard;
+                       telemetries.setSelectedIndex(telemetry - 1);
+                       telemetries.setMaximumRowCount(Altos.ao_telemetry_max);
+                       telemetries.setPreferredSize(null);
+                       telemetries.revalidate();
+                       telemetries.addActionListener(new ActionListener() {
+                                       public void actionPerformed(ActionEvent e) {
+                                               int telemetry = telemetries.getSelectedIndex() + 1;
+                                               reader.set_telemetry(telemetry);
+                                               reader.save_telemetry();
+                                       }
+                               });
+                       c.gridx = 1;
+                       c.gridy = 0;
+                       c.weightx = 0;
+                       c.weighty = 0;
+                       c.fill = GridBagConstraints.NONE;
+                       c.anchor = GridBagConstraints.WEST;
+                       bag.add (telemetries, c);
+                       c.insets = new Insets(0, 0, 0, 0);
                }
 
                /* Flight status is always visible */
@@ -162,7 +214,9 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                c.gridy = 1;
                c.fill = GridBagConstraints.HORIZONTAL;
                c.weightx = 1;
+               c.gridwidth = 2;
                bag.add(flightStatus, c);
+               c.gridwidth = 1;
 
                /* The rest of the window uses a tabbed pane to
                 * show one of the alternate data views
@@ -178,14 +232,17 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                descent = new AltosDescent();
                pane.add("Descent", descent);
 
-               landed = new AltosLanded();
+               landed = new AltosLanded(reader);
                pane.add("Landed", landed);
 
                flightInfo = new AltosInfoTable();
                pane.add("Table", new JScrollPane(flightInfo));
 
+               companion = new AltosCompanionInfo();
+               has_companion = false;
+
                sitemap = new AltosSiteMap();
-               pane.add("Site Map", sitemap);
+               has_map = false;
 
                /* Make the tabbed pane use the rest of the window space */
                c.gridx = 0;
@@ -193,6 +250,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                c.fill = GridBagConstraints.BOTH;
                c.weightx = 1;
                c.weighty = 1;
+               c.gridwidth = 2;
                bag.add(pane, c);
 
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);