altosuilib: Rewrite map GUI bits
[fw/altos] / altosui / AltosFlightUI.java
index 08e8550f3bf02241e1786d3085602e8f221d58eb..f2bd70a0c5b44e10b9c10b7952b44d3ca1b73940 100644 (file)
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package AltosUI;
+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.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
-public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener {
+public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay {
        AltosVoice              voice;
        AltosFlightReader       reader;
        AltosDisplayThread      thread;
@@ -37,13 +32,16 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
        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;
@@ -77,6 +75,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
        public void reset() {
                pad.reset();
+               ignitor.reset();
                ascent.reset();
                descent.reset();
                landed.reset();
@@ -84,47 +83,83 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                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();
-       }
-
        public void font_size_changed(int font_size) {
-               set_font();
+               pad.font_size_changed(font_size);
+               ignitor.font_size_changed(font_size);
+               ascent.font_size_changed(font_size);
+               descent.font_size_changed(font_size);
+               landed.font_size_changed(font_size);
+               flightStatus.font_size_changed(font_size);
+               flightInfo.font_size_changed(font_size);
+               sitemap.font_size_changed(font_size);
+               companion.font_size_changed(font_size);
        }
 
+       public void units_changed(boolean imperial_units) {
+               pad.units_changed(imperial_units);
+               ignitor.units_changed(imperial_units);
+               ascent.units_changed(imperial_units);
+               descent.units_changed(imperial_units);
+               landed.units_changed(imperial_units);
+               flightStatus.units_changed(imperial_units);
+               flightInfo.units_changed(imperial_units);
+               sitemap.units_changed(imperial_units);
+               companion.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();
+
+               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);
@@ -136,16 +171,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);
-               }
        }
 
        public void set_exit_on_close() {
@@ -154,7 +186,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
        Container       bag;
        AltosFreqList   frequencies;
-       JComboBox       telemetries;
+       JComboBox<String>       telemetries;
        JLabel          telemetry;
 
        ActionListener  show_timer;
@@ -170,10 +202,6 @@ 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 */
@@ -204,8 +232,8 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
 
                        // Telemetry format menu
                        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 ||
@@ -268,24 +296,21 @@ 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();
+               sitemap = new AltosUIMap();
                has_map = false;
 
                /* Make the tabbed pane use the rest of the window space */
@@ -300,6 +325,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 
                AltosUIPreferences.register_font_listener(this);
+               AltosPreferences.register_units_listener(this);
 
                addWindowListener(new WindowAdapter() {
                                @Override
@@ -308,6 +334,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt
                                        setVisible(false);
                                        dispose();
                                        AltosUIPreferences.unregister_font_listener(AltosFlightUI.this);
+                                       AltosPreferences.unregister_units_listener(AltosFlightUI.this);
                                        if (exit_on_close)
                                                System.exit(0);
                                }