projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge branch 'buttonbox' of git://git.gag.com/fw/altos into buttonbox
[fw/altos]
/
ao-tools
/
altosui
/
AltosFlightUI.java
diff --git
a/ao-tools/altosui/AltosFlightUI.java
b/ao-tools/altosui/AltosFlightUI.java
index 56ab7ebc4ac01546d210b8446cb7c010d5816f9b..21b41528b32a056aee22989167cbead46b506425 100644
(file)
--- a/
ao-tools/altosui/AltosFlightUI.java
+++ b/
ao-tools/altosui/AltosFlightUI.java
@@
-42,9
+42,11
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
AltosAscent ascent;
AltosDescent descent;
AltosLanded landed;
+ AltosSiteMap sitemap;
private AltosFlightStatus flightStatus;
private JScrollPane flightInfoPane;
private AltosFlightStatus flightStatus;
private JScrollPane flightInfoPane;
+ private JScrollPane sitemapPane;
private AltosInfoTable flightInfo;
static final int tab_pad = 1;
private AltosInfoTable flightInfo;
static final int tab_pad = 1;
@@
-94,6
+96,7
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
descent.reset();
landed.reset();
flightInfo.clear();
descent.reset();
landed.reset();
flightInfo.clear();
+ sitemap.reset();
}
public void show(AltosState state, int crc_errors) {
}
public void show(AltosState state, int crc_errors) {
@@
-120,6
+123,7
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
}
flightStatus.show(state, crc_errors);
flightInfo.show(state, crc_errors);
}
flightStatus.show(state, crc_errors);
flightInfo.show(state, crc_errors);
+ sitemap.show(state, crc_errors);
}
public void set_exit_on_close() {
}
public void set_exit_on_close() {
@@
-186,6
+190,10
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
flightInfoPane = new JScrollPane(flightInfo.box());
pane.add("Table", flightInfoPane);
flightInfoPane = new JScrollPane(flightInfo.box());
pane.add("Table", flightInfoPane);
+ sitemap = new AltosSiteMap();
+ sitemapPane = new JScrollPane(sitemap);
+ pane.add("Site Map", sitemapPane);
+
c.gridx = 0;
c.gridy = 2;
c.fill = GridBagConstraints.BOTH;
c.gridx = 0;
c.gridy = 2;
c.fill = GridBagConstraints.BOTH;