X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightUI.java;h=b31de12c858ee6cf0f6c3a5ec10ce8051ef77bfc;hp=d99da43dea0622b4f50bbd53ddbabeeb647bea9d;hb=4ac7797d3efb9cc2d9fae88519f55e40b1050224;hpb=d77a4ea206d627635159f35c76c744687d4e633b diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java index d99da43d..b31de12c 100644 --- a/altosui/AltosFlightUI.java +++ b/altosui/AltosFlightUI.java @@ -20,30 +20,11 @@ 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_3.*; +import org.altusmetrum.altosuilib_1.*; -class AltosFlightStatusUpdate implements ActionListener { - - public AltosState saved_state; - AltosFlightStatus flightStatus; - - public void actionPerformed (ActionEvent e) { - if (saved_state != null) - flightStatus.show(saved_state, 0); - } - - public AltosFlightStatusUpdate (AltosFlightStatus in_flightStatus) { - flightStatus = in_flightStatus; - } -} - -public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, AltosFontListener { +public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener { AltosVoice voice; AltosFlightReader reader; AltosDisplayThread thread; @@ -51,6 +32,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt JTabbedPane pane; AltosPad pad; + AltosIgnitor ignitor; AltosAscent ascent; AltosDescent descent; AltosLanded landed; @@ -58,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; @@ -91,6 +75,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt public void reset() { pad.reset(); + ignitor.reset(); ascent.reset(); descent.reset(); landed.reset(); @@ -100,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(); @@ -116,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); @@ -150,16 +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); - } } public void set_exit_on_close() { @@ -168,13 +179,13 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt Container bag; AltosFreqList frequencies; - JComboBox telemetries; + JComboBox 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); voice = in_voice; reader = in_reader; @@ -184,16 +195,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)); + frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial)); frequencies.set_product("Monitor"); frequencies.set_serial(serial); frequencies.addActionListener(new ActionListener() { @@ -218,8 +225,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(); + 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 || @@ -282,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; @@ -313,7 +317,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE); - AltosPreferences.register_font_listener(this); + AltosUIPreferences.register_font_listener(this); addWindowListener(new WindowAdapter() { @Override @@ -321,7 +325,7 @@ public class AltosFlightUI extends AltosFrame implements AltosFlightDisplay, Alt disconnect(); setVisible(false); dispose(); - AltosPreferences.unregister_font_listener(AltosFlightUI.this); + AltosUIPreferences.unregister_font_listener(AltosFlightUI.this); if (exit_on_close) System.exit(0); }