altosui: Replace flight status table with labels, fix resize.

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

diff --git a/ao-tools/altosui/AltosFlightUI.java b/ao-tools/altosui/AltosFlightUI.java
index 84ba9dca5c1902fdf3f9eef7118563748f8458ed..ae31048d2648754573d879cb863a65714f214204 100644 (file)
--- a/ao-tools/altosui/AltosFlightUI.java
+++ b/ao-tools/altosui/AltosFlightUI.java
@@ -28,7 +28,7 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
-public class AltosFlightUI extends JFrame {
+public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
        String[] statusNames = { "Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
        Object[][] statusData = { { "0", "pad", "-50", "0" } };
 
@@ -37,9 +37,35 @@ public class AltosFlightUI extends JFrame {
        AltosDisplayThread      thread;
 
        private Box vbox;
-       private AltosStatusTable flightStatus;
+
+       JTabbedPane     pane;
+
+       AltosPad        pad;
+       AltosAscent     ascent;
+       AltosDescent    descent;
+       AltosLanded     landed;
+
+       private AltosFlightStatus flightStatus;
+       private JScrollPane flightInfoPane;
        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();
        }
@@ -62,7 +88,43 @@ public class AltosFlightUI extends JFrame {
                stop_display();
        }
 
+       public void reset() {
+               pad.reset();
+               ascent.reset();
+               descent.reset();
+               landed.reset();
+               flightInfo.clear();
+       }
+
+       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.show(state, crc_errors);
+               flightInfo.show(state, crc_errors);
+       }
+
        public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
+        AltosPreferences.init(this);
+
                voice = in_voice;
                reader = in_reader;
 
@@ -72,13 +134,30 @@ public class AltosFlightUI extends JFrame {
 
                setTitle(String.format("AltOS %s", reader.name));
 
-               flightStatus = new AltosStatusTable();
+               flightStatus = new AltosFlightStatus();
 
                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());
+               flightInfoPane = new JScrollPane(flightInfo.box());
+               pane.add("Table", flightInfoPane);
+
+               vbox.add(pane);
 
                this.add(vbox);
 
@@ -117,7 +196,7 @@ public class AltosFlightUI extends JFrame {
 
                this.setVisible(true);
 
-               thread = new AltosDisplayThread(this, voice, flightStatus, flightInfo, reader);
+               thread = new AltosDisplayThread(this, voice, this, reader);
 
                thread.start();
        }