projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altoslib/altosuilib: Change versions to altoslib:4, altosuilib:2
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index e8cf7f081a06c3a5827f9f260395a5629dbb620c..2bd60d6c02e31c7680278748b1f1457be726a5b0 100644
(file)
--- a/
altosui/AltosFlightUI.java
+++ b/
altosui/AltosFlightUI.java
@@
-21,8
+21,8
@@
import java.awt.*;
import java.awt.event.*;
import javax.swing.*;
import java.util.concurrent.*;
import java.awt.event.*;
import javax.swing.*;
import java.util.concurrent.*;
-import org.altusmetrum.altoslib_
3
.*;
-import org.altusmetrum.altosuilib_
1
.*;
+import org.altusmetrum.altoslib_
4
.*;
+import org.altusmetrum.altosuilib_
2
.*;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
AltosVoice voice;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
AltosVoice voice;
@@
-32,6
+32,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
JTabbedPane pane;
AltosPad pad;
JTabbedPane pane;
AltosPad pad;
+ AltosIgnitor ignitor;
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
@@
-40,6
+41,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
boolean has_map;
boolean has_companion;
boolean has_state;
boolean has_map;
boolean has_companion;
boolean has_state;
+ boolean has_ignitor;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
@@
-73,6
+75,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
public void reset() {
pad.reset();
public void reset() {
pad.reset();
+ ignitor.reset();
ascent.reset();
descent.reset();
landed.reset();
ascent.reset();
descent.reset();
landed.reset();
@@
-82,6
+85,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
public void set_font() {
pad.set_font();
public void set_font() {
pad.set_font();
+ ignitor.set_font();
ascent.set_font();
descent.set_font();
landed.set_font();
ascent.set_font();
descent.set_font();
landed.set_font();
@@
-130,6
+134,19
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
flightStatus.show(state, listener_state);
flightInfo.show(state, listener_state);
flightStatus.show(state, listener_state);
flightInfo.show(state, listener_state);
+ 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);
if (state.companion != null) {
if (!has_companion) {
pane.add("Companion", companion);
@@
-162,7
+179,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
Container bag;
AltosFreqList frequencies;
Container bag;
AltosFreqList frequencies;
- JComboBox telemetries;
+ JComboBox
<String>
telemetries;
JLabel telemetry;
ActionListener show_timer;
JLabel telemetry;
ActionListener show_timer;
@@
-208,8
+225,8
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
// Telemetry format menu
if (reader.supports_telemetry(Altos.ao_telemetry_standard)) {
// 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 ||
telemetries.addItem(Altos.telemetry_name(i));
int telemetry = AltosPreferences.telemetry(serial);
if (telemetry <= Altos.ao_telemetry_off ||
@@
-274,6
+291,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
pad = new AltosPad();
pane.add("Status", pad);
pad = new AltosPad();
pane.add("Status", pad);
+ ignitor = new AltosIgnitor();
ascent = new AltosAscent();
descent = new AltosDescent();
landed = new AltosLanded(reader);
ascent = new AltosAscent();
descent = new AltosDescent();
landed = new AltosLanded(reader);