altosui/telegps: Undo the frequency/telemetry menu changes
[fw/altos] / altosui / AltosFlightUI.java
index b2ae485801212dc4198ffb03e91513866f4c581c..5db0ee92864641e273e5ee80c31828ccb195d627 100644 (file)
@@ -20,29 +20,31 @@ package altosui;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
 import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
 import java.util.concurrent.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
-public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
+public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
        AltosVoice              voice;
        AltosFlightReader       reader;
        AltosDisplayThread      thread;
 
+       LinkedList<AltosFlightDisplay> displays;
+
        JTabbedPane     pane;
 
        AltosPad        pad;
+       AltosIgnitor    ignitor;
        AltosAscent     ascent;
        AltosDescent    descent;
        AltosLanded     landed;
        AltosCompanionInfo      companion;
-       AltosSiteMap    sitemap;
+       AltosUIMap      sitemap;
        boolean         has_map;
        boolean         has_companion;
+       boolean         has_state;
+       boolean         has_ignitor;
 
        private AltosFlightStatus flightStatus;
        private AltosInfoTable flightInfo;
@@ -57,6 +59,8 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                        return ascent;
                if (state.state <= Altos.ao_flight_main)
                        return descent;
+               if (state.state == AltosLib.ao_flight_stateless)
+                       return descent;
                return landed;
        }
 
@@ -75,75 +79,89 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
        }
 
        public void reset() {
-               pad.reset();
-               ascent.reset();
-               descent.reset();
-               landed.reset();
-               flightInfo.clear();
-               sitemap.reset();
-       }
-
-       public void set_font() {
-               pad.set_font();
-               ascent.set_font();
-               descent.set_font();
-               landed.set_font();
-               flightStatus.set_font();
-               flightInfo.set_font();
-               sitemap.set_font();
-               companion.set_font();
+               for (AltosFlightDisplay d : displays)
+                       d.reset();
        }
 
        public void font_size_changed(int font_size) {
-               set_font();
+               for (AltosFlightDisplay d : displays)
+                       d.font_size_changed(font_size);
        }
 
+       public void units_changed(boolean imperial_units) {
+               for (AltosFlightDisplay d : displays)
+                       d.units_changed(imperial_units);
+       }
 
        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();
+
+               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;
+                       }
+               }
+
                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);
 
-               if (state.data.companion != null) {
+               if (ignitor.should_show(state)) {
+                       if (!has_ignitor) {
+                               pane.add("Ignitor", ignitor);
+                               has_ignitor = true;
+                       }
+               } 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);
                } else {
                        if (has_companion) {
                                pane.remove(companion);
                                has_companion = false;
                        }
                }
+
                if (state.gps != null && state.gps.connected) {
                        if (!has_map) {
                                pane.add("Site Map", sitemap);
                                has_map = true;
                        }
-                       sitemap.show(state, crc_errors);
                } else {
                        if (has_map) {
                                pane.remove(sitemap);
                                has_map = false;
                        }
                }
-               } catch (Exception e) {
-                       System.out.print("Show exception" + e);
+
+               for (AltosFlightDisplay d : displays) {
+                       try {
+                               d.show(state, listener_state);
+                       } catch (Exception e) {
+                               System.out.printf("Exception showing %s\n", d.getName());
+                               e.printStackTrace();
+                       }
                }
        }
 
@@ -151,15 +169,17 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                exit_on_close = true;
        }
 
-       Container       bag;
-       AltosFreqList   frequencies;
-       JComboBox       telemetries;
-       JLabel          telemetry;
+       Container               bag;
+       AltosUIFreqList         frequencies;
+       AltosUITelemetryList    telemetries;
+       JLabel                  telemetry;
 
        ActionListener  show_timer;
 
        public AltosFlightUI(AltosVoice in_voice, AltosFlightReader in_reader, final int serial) {
-               AltosPreferences.set_component(this);
+               AltosUIPreferences.set_component(this);
+
+               displays = new LinkedList<AltosFlightDisplay>();
 
                voice = in_voice;
                reader = in_reader;
@@ -169,16 +189,12 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
                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));
 
                /* Stick channel selector at top of table for telemetry monitoring */
                if (serial >= 0) {
-                       // Channel menu
-                       frequencies = new AltosFreqList(AltosPreferences.frequency(serial));
+                       // Frequency menu
+                       frequencies = new AltosUIFreqList(AltosUIPreferences.frequency(serial));
                        frequencies.set_product("Monitor");
                        frequencies.set_serial(serial);
                        frequencies.addActionListener(new ActionListener() {
@@ -201,10 +217,10 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                        c.anchor = GridBagConstraints.WEST;
                        bag.add (frequencies, c);
 
-                       // Telemetry format menu
+                       // Telemetry format list
                        if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
-                               telemetries = new JComboBox();
-                               for (int i = 1; i <= Altos.ao_telemetry_max; i++) 
+                               telemetries = new JComboBox<String>();
+                               for (int i = 1; i <= Altos.ao_telemetry_max; i++)
                                        telemetries.addItem(Altos.telemetry_name(i));
                                int telemetry = AltosPreferences.telemetry(serial);
                                if (telemetry <= Altos.ao_telemetry_off ||
@@ -253,6 +269,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
                /* Flight status is always visible */
                flightStatus = new AltosFlightStatus();
+               displays.add(flightStatus);
                c.gridx = 0;
                c.gridy = 1;
                c.fill = GridBagConstraints.HORIZONTAL;
@@ -267,24 +284,29 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                pane = new JTabbedPane();
 
                pad = new AltosPad();
-               pane.add("Launch Pad", pad);
+               displays.add(pad);
+               pane.add("Status", pad);
 
+               ignitor = new AltosIgnitor();
+               displays.add(ignitor);
                ascent = new AltosAscent();
-               pane.add("Ascent", ascent);
-
+               displays.add(ascent);
                descent = new AltosDescent();
-               pane.add("Descent", descent);
-
+               displays.add(descent);
                landed = new AltosLanded(reader);
-               pane.add("Landed", landed);
+               displays.add(landed);
 
                flightInfo = new AltosInfoTable();
+               displays.add(flightInfo);
                pane.add("Table", new JScrollPane(flightInfo));
 
                companion = new AltosCompanionInfo();
+               displays.add(companion);
                has_companion = false;
+               has_state = false;
 
-               sitemap = new AltosSiteMap();
+               sitemap = new AltosUIMap();
+               displays.add(sitemap);
                has_map = false;
 
                /* Make the tabbed pane use the rest of the window space */
@@ -298,7 +320,8 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
-               AltosPreferences.register_font_listener(this);
+               AltosUIPreferences.register_font_listener(this);
+               AltosPreferences.register_units_listener(this);
 
                addWindowListener(new WindowAdapter() {
                                @Override
@@ -306,7 +329,8 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                                        disconnect();
                                        setVisible(false);
                                        dispose();
-                                       AltosPreferences.unregister_font_listener(AltosFlightUI.this);
+                                       AltosUIPreferences.unregister_font_listener(AltosFlightUI.this);
+                                       AltosPreferences.unregister_units_listener(AltosFlightUI.this);
                                        if (exit_on_close)
                                                System.exit(0);
                                }