Merge branch 'buttonbox' into sitemap

[fw/altos] / ao-tools / altosui / AltosFlightUI.java

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 5134a24ebd731ed09533e2c1f1e05bcf3f9866a8..1107d52725a62125d46c1c1940d73f908747d69a 100644 (file)
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -36,17 +36,15 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
        AltosFlightReader       reader;
        AltosDisplayThread      thread;
 
-       private Box vbox;
-
        JTabbedPane     pane;
 
        AltosPad        pad;
        AltosAscent     ascent;
        AltosDescent    descent;
        AltosLanded     landed;
+       AltosSiteMap    sitemap;
 
        private AltosFlightStatus flightStatus;
-       private JScrollPane flightInfoPane;
        private AltosInfoTable flightInfo;
 
        static final int tab_pad = 1;
@@ -68,14 +66,6 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                return tab_landed;
        }
 
-       public int width() {
-               return flightInfo.width();
-       }
-
-       public int height() {
-               return flightStatus.height() + flightInfo.height();
-       }
-
        void stop_display() {
                if (thread != null && thread.isAlive()) {
                        thread.interrupt();
@@ -96,6 +86,7 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                descent.reset();
                landed.reset();
                flightInfo.clear();
+               sitemap.reset();
        }
 
        public void show(AltosState state, int crc_errors) {
@@ -122,29 +113,61 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                }
                flightStatus.show(state, crc_errors);
                flightInfo.show(state, crc_errors);
+               sitemap.show(state, crc_errors);
        }
 
        public void set_exit_on_close() {
                exit_on_close = true;
        }
 
+       Container       bag;
+       JComboBox       channels;
+
        public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
                AltosPreferences.init(this);
 
                voice = in_voice;
                reader = in_reader;
 
+               bag = getContentPane();
+               bag.setLayout(new GridBagLayout());
+
+               GridBagConstraints c = new GridBagConstraints();
+
                java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
                if (imgURL != null)
                        setIconImage(new ImageIcon(imgURL).getImage());
 
                setTitle(String.format("AltOS %s", reader.name));
 
-               flightStatus = new AltosFlightStatus();
-
-               vbox = new Box (BoxLayout.Y_AXIS);
-               vbox.add(flightStatus);
+               /* 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);
+                                       AltosPreferences.set_channel(serial, channel);
+                               }
+                       });
+                       c.gridx = 0;
+                       c.gridy = 0;
+                       c.anchor = GridBagConstraints.WEST;
+                       bag.add (channels, c);
+               }
 
+               /* Flight status is always visible */
+               flightStatus = new AltosFlightStatus();
+               c.gridx = 0;
+               c.gridy = 1;
+               c.fill = GridBagConstraints.HORIZONTAL;
+               c.weightx = 1;
+               bag.add(flightStatus, c);
+
+               /* The rest of the window uses a tabbed pane to
+                * show one of the alternate data views
+                */
                pane = new JTabbedPane();
 
                pad = new AltosPad();
@@ -160,35 +183,18 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                pane.add("Landed", landed);
 
                flightInfo = new AltosInfoTable();
-               flightInfoPane = new JScrollPane(flightInfo.box());
-               pane.add("Table", flightInfoPane);
+               pane.add("Table", new JScrollPane(flightInfo));
 
-               vbox.add(pane);
-
-               this.add(vbox);
-
-               if (serial >= 0) {
-                       JMenuBar menubar = new JMenuBar();
-
-                       // Channel menu
-                       {
-                               JMenu menu = new AltosChannelMenu(AltosPreferences.channel(serial));
-                               menu.addActionListener(new ActionListener() {
-                                               public void actionPerformed(ActionEvent e) {
-                                                       int channel = Integer.parseInt(e.getActionCommand());
-                                                       reader.set_channel(channel);
-                                                       AltosPreferences.set_channel(serial, channel);
-                                               }
-                                       });
-                               menu.setMnemonic(KeyEvent.VK_C);
-                               menubar.add(menu);
-                       }
-
-                       this.setJMenuBar(menubar);
-               }
+               sitemap = new AltosSiteMap();
+               pane.add("Site Map", sitemap);
 
-               this.setSize(new Dimension (width(), height()));
-               this.validate();
+               /* Make the tabbed pane use the rest of the window space */
+               c.gridx = 0;
+               c.gridy = 2;
+               c.fill = GridBagConstraints.BOTH;
+               c.weightx = 1;
+               c.weighty = 1;
+               bag.add(pane, c);
 
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
                addWindowListener(new WindowAdapter() {
@@ -202,7 +208,8 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                        }
                });
 
-               this.setVisible(true);
+               pack();
+               setVisible(true);
 
                thread = new AltosDisplayThread(this, voice, this, reader);