altosui: Add ignitor tab for TeleMega extra ignitors

[fw/altos] / altosui / AltosFlightUI.java

diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java
index 604ea6580103529ed6d77bcb532de8fd977ea25e..aac4c9b0c655c638bc5e19d0dff5709d32beac62 100644 (file)
--- a/altosui/AltosFlightUI.java
+++ b/altosui/AltosFlightUI.java
@@ -21,10 +21,10 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import java.util.concurrent.*;
-import org.altusmetrum.AltosLib.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altosuilib_1.*;
 
-public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
+public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
        AltosVoice              voice;
        AltosFlightReader       reader;
        AltosDisplayThread      thread;
@@ -32,6 +32,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
        JTabbedPane     pane;
 
        AltosPad        pad;
+       AltosIgnitor    ignitor;
        AltosAscent     ascent;
        AltosDescent    descent;
        AltosLanded     landed;
@@ -39,6 +40,8 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
        AltosSiteMap    sitemap;
        boolean         has_map;
        boolean         has_companion;
+       boolean         has_state;
+       boolean         has_ignitor;
 
        private AltosFlightStatus flightStatus;
        private AltosInfoTable flightInfo;
@@ -72,6 +75,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
        public void reset() {
                pad.reset();
+               ignitor.reset();
                ascent.reset();
                descent.reset();
                landed.reset();
@@ -81,6 +85,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
        public void set_font() {
                pad.set_font();
+               ignitor.set_font();
                ascent.set_font();
                descent.set_font();
                landed.set_font();
@@ -97,29 +102,57 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
        AltosFlightStatusUpdate status_update;
 
-       public void show(AltosState state, int crc_errors) {
+       public void show(AltosState state, AltosListenerState listener_state) {
                status_update.saved_state = state;
+
+               if (state == null)
+                       state = new AltosState();
+
+               pad.show(state, listener_state);
+
+               if (state.state != Altos.ao_flight_startup) {
+                       if (!has_state) {
+                               pane.setTitleAt(0, "Launch Pad");
+                               pane.add(ascent, 1);
+                               pane.add(descent, 2);
+                               pane.add(landed, 3);
+                               has_state = true;
+                       }
+               }
+
+               ascent.show(state, listener_state);
+               descent.show(state, listener_state);
+               landed.show(state, listener_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) {
                        if (cur_tab == pane.getSelectedComponent()) {
                                pane.setSelectedComponent(tab);
                        }
                        cur_tab = tab;
                }
-               flightStatus.show(state, crc_errors);
-               flightInfo.show(state, crc_errors);
+               flightStatus.show(state, listener_state);
+               flightInfo.show(state, listener_state);
 
-               if (state.data.companion != null) {
+               if (ignitor.should_show(state)) {
+                       if (!has_ignitor) {
+                               pane.add("Ignitor", ignitor);
+                               has_ignitor = true;
+                       }
+                       ignitor.show(state, listener_state);
+               } else {
+                       if (has_ignitor) {
+                               pane.remove(ignitor);
+                               has_ignitor = false;
+                       }
+               }
+
+               if (state.companion != null) {
                        if (!has_companion) {
                                pane.add("Companion", companion);
                                has_companion= true;
                        }
-                       companion.show(state, crc_errors);
+                       companion.show(state, listener_state);
                } else {
                        if (has_companion) {
                                pane.remove(companion);
@@ -131,17 +164,13 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                                pane.add("Site Map", sitemap);
                                has_map = true;
                        }
-                       sitemap.show(state, crc_errors);
+                       sitemap.show(state, listener_state);
                } else {
                        if (has_map) {
                                pane.remove(sitemap);
                                has_map = false;
                        }
                }
-               } catch (Exception e) {
-                       System.out.print("Show exception " + e + "\n");
-                       e.printStackTrace();
-               }
        }
 
        public void set_exit_on_close() {
@@ -260,22 +289,19 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                pane = new JTabbedPane();
 
                pad = new AltosPad();
-               pane.add("Launch Pad", pad);
+               pane.add("Status", pad);
 
+               ignitor = new AltosIgnitor();
                ascent = new AltosAscent();
-               pane.add("Ascent", ascent);
-
                descent = new AltosDescent();
-               pane.add("Descent", descent);
-
                landed = new AltosLanded(reader);
-               pane.add("Landed", landed);
 
                flightInfo = new AltosInfoTable();
                pane.add("Table", new JScrollPane(flightInfo));
 
                companion = new AltosCompanionInfo();
                has_companion = false;
+               has_state = false;
 
                sitemap = new AltosSiteMap();
                has_map = false;