projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index e2dc06bd97842182fc35bd3399258f22560a3bd2..c04a4357f6f898bb5a54882abf7a9366cbeee76c 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
.*;
-import org.altusmetrum.altosuilib.*;
+import org.altusmetrum.
altoslib_1
.*;
+import org.altusmetrum.altosuilib
_1
.*;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
AltosVoice voice;
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener {
AltosVoice voice;
@@
-39,6
+39,7
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
AltosSiteMap sitemap;
boolean has_map;
boolean has_companion;
AltosSiteMap sitemap;
boolean has_map;
boolean has_companion;
+ boolean has_state;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
@@
-102,9
+103,21
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
JComponent tab = which_tab(state);
try {
pad.show(state, crc_errors);
JComponent tab = which_tab(state);
try {
pad.show(state, crc_errors);
+
+ 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, crc_errors);
descent.show(state, crc_errors);
landed.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);
if (tab != cur_tab) {
if (cur_tab == pane.getSelectedComponent()) {
pane.setSelectedComponent(tab);
@@
-260,22
+273,18
@@
public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay, A
pane = new JTabbedPane();
pad = new AltosPad();
pane = new JTabbedPane();
pad = new AltosPad();
- pane.add("
Launch Pad
", pad);
+ pane.add("
Status
", pad);
ascent = new AltosAscent();
ascent = new AltosAscent();
- pane.add("Ascent", ascent);
-
descent = new AltosDescent();
descent = new AltosDescent();
- pane.add("Descent", descent);
-
landed = new AltosLanded(reader);
landed = new AltosLanded(reader);
- pane.add("Landed", landed);
flightInfo = new AltosInfoTable();
pane.add("Table", new JScrollPane(flightInfo));
companion = new AltosCompanionInfo();
has_companion = false;
flightInfo = new AltosInfoTable();
pane.add("Table", new JScrollPane(flightInfo));
companion = new AltosCompanionInfo();
has_companion = false;
+ has_state = false;
sitemap = new AltosSiteMap();
has_map = false;
sitemap = new AltosSiteMap();
has_map = false;