make infotable scrollable, revert its fontsize to 14

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

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 11fc24425598b238a341e422ee54c12c60bce472..f56b3d1bd4cf200a79e6e8736fc1234ceaf486c9 100644 (file)
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -37,9 +37,35 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
        AltosDisplayThread      thread;
 
        private Box vbox;
+
+       JTabbedPane     pane;
+
+       AltosPad        pad;
+       AltosAscent     ascent;
+       AltosDescent    descent;
+       AltosLanded     landed;
+    AltosSiteMap    sitemap;
+
        private AltosStatusTable 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;
+
+       int which_tab(AltosState state) {
+               if (state.state < Altos.ao_flight_boost)
+                       return tab_pad;
+               if (state.state <= Altos.ao_flight_coast)
+                       return tab_ascent;
+               if (state.state <= Altos.ao_flight_main)
+                       return tab_descent;
+               return tab_landed;
+       }
+
        public int width() {
                return flightInfo.width();
        }
@@ -63,15 +89,44 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
        }
 
        public void reset() {
+               pad.reset();
+               ascent.reset();
+               descent.reset();
+               landed.reset();
                flightInfo.clear();
+               sitemap.reset();
        }
 
        public void show(AltosState state, int crc_errors) {
+               int     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);
+                       }
+                       cur_tab = tab;
+               }
                flightStatus.set(state);
                flightInfo.show(state, crc_errors);
+               sitemap.show(state, crc_errors);
        }
 
        public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
+        AltosPreferences.init(this);
+
                voice = in_voice;
                reader = in_reader;
 
@@ -86,8 +141,27 @@ public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
                vbox = new Box (BoxLayout.Y_AXIS);
                vbox.add(flightStatus);
 
+               pane = new JTabbedPane();
+
+               pad = new AltosPad();
+               pane.add("Launch Pad", pad);
+
+               ascent = new AltosAscent();
+               pane.add("Ascent", ascent);
+
+               descent = new AltosDescent();
+               pane.add("Descent", descent);
+
+               landed = new AltosLanded();
+               pane.add("Landed", landed);
+
                flightInfo = new AltosInfoTable();
-               vbox.add(flightInfo.box());
+               pane.add("Table", new JScrollPane(flightInfo.box()));
+
+        sitemap = new AltosSiteMap();
+        pane.add("Site Map", sitemap);
+
+               vbox.add(pane);
 
                this.add(vbox);