projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Add mock-up of TeleTerra UI
[fw/altos]
/
altosui
/
AltosFlightUI.java
diff --git
a/altosui/AltosFlightUI.java
b/altosui/AltosFlightUI.java
index eb6c6d9d82d1edc5f3500dcc142f3769dfc6d39d..7f2b29885dab064f688ea875fc5f46778257e8d0 100644
(file)
--- a/
altosui/AltosFlightUI.java
+++ b/
altosui/AltosFlightUI.java
@@
-41,6
+41,7
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
AltosLanded landed;
AltosSiteMap sitemap;
boolean has_map;
AltosLanded landed;
AltosSiteMap sitemap;
boolean has_map;
+ AltosTerra terra;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
@@
-88,6
+89,7
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
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);
+ terra.display(state);
if (tab != cur_tab) {
if (cur_tab == pane.getSelectedComponent()) {
pane.setSelectedComponent(tab);
if (tab != cur_tab) {
if (cur_tab == pane.getSelectedComponent()) {
pane.setSelectedComponent(tab);
@@
-231,6
+233,9
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
pack();
setVisible(true);
pack();
setVisible(true);
+ terra = new AltosTerra(this);
+ terra.setVisible(true);
+
thread = new AltosDisplayThread(this, voice, this, reader);
thread.start();
thread = new AltosDisplayThread(this, voice, this, reader);
thread.start();