docs: Document altosui "Graph Data" button

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

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 658d6f6f611f8e36a5b324b29bdc0c16e23dd559..7fcfb8be6da68d5f356dd723ea146cf195089127 100644 (file)
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -36,46 +36,28 @@ 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;
+       AltosSiteMap    sitemap;
 
        private AltosFlightStatus flightStatus;
-       private JScrollPane flightInfoPane;
-       private JScrollPane sitemapPane;
        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;
-       }
-
-       public int width() {
-               return flightInfo.width();
-       }
-
-       public int height() {
-               return flightStatus.height() + flightInfo.height();
+                       return descent;
+               return landed;
        }
 
        void stop_display() {
@@ -102,24 +84,14 @@ 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);
                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;
                }
@@ -132,23 +104,53 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                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);
+                               }
+                       });
+                       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();
@@ -164,53 +166,33 @@ 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));
 
-        sitemap = new AltosSiteMap();
-               sitemapPane = new JScrollPane(sitemap);
-        pane.add("Site Map", sitemapPane);
+               sitemap = new AltosSiteMap();
+               pane.add("Site Map", sitemap);
 
-               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);
-               }
-
-               this.setSize(this.getPreferredSize());
-               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() {
-                       @Override
-                       public void windowClosing(WindowEvent e) {
-                               disconnect();
-                               setVisible(false);
-                               dispose();
-                               if (exit_on_close)
-                                       System.exit(0);
-                       }
-               });
-
-               this.setVisible(true);
+                               @Override
+                               public void windowClosing(WindowEvent e) {
+                                       disconnect();
+                                       setVisible(false);
+                                       dispose();
+                                       if (exit_on_close)
+                                               System.exit(0);
+                               }
+                       });
+
+               pack();
+               setVisible(true);
 
                thread = new AltosDisplayThread(this, voice, this, reader);