projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui: Add tab UI with 'pad' mode.
[fw/altos]
/
ao-tools
/
altosui
/
AltosFlightUI.java
diff --git
a/ao-tools/altosui/AltosFlightUI.java
b/ao-tools/altosui/AltosFlightUI.java
index 11fc24425598b238a341e422ee54c12c60bce472..a7caf7e9620d9f504f5d673a0e3a5b1779734993 100644
(file)
--- a/
ao-tools/altosui/AltosFlightUI.java
+++ b/
ao-tools/altosui/AltosFlightUI.java
@@
-37,6
+37,11
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
AltosDisplayThread thread;
private Box vbox;
AltosDisplayThread thread;
private Box vbox;
+
+ JTabbedPane pane;
+
+ AltosPad pad;
+
private AltosStatusTable flightStatus;
private AltosInfoTable flightInfo;
private AltosStatusTable flightStatus;
private AltosInfoTable flightInfo;
@@
-63,10
+68,12
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
}
public void reset() {
}
public void reset() {
+ pad.reset();
flightInfo.clear();
}
public void show(AltosState state, int crc_errors) {
flightInfo.clear();
}
public void show(AltosState state, int crc_errors) {
+ pad.show(state, crc_errors);
flightStatus.set(state);
flightInfo.show(state, crc_errors);
}
flightStatus.set(state);
flightInfo.show(state, crc_errors);
}
@@
-86,8
+93,15
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
vbox = new Box (BoxLayout.Y_AXIS);
vbox.add(flightStatus);
vbox = new Box (BoxLayout.Y_AXIS);
vbox.add(flightStatus);
+ pane = new JTabbedPane();
+
+ pad = new AltosPad();
+ pane.add("Launch Pad", pad);
+
flightInfo = new AltosInfoTable();
flightInfo = new AltosInfoTable();
- vbox.add(flightInfo.box());
+ pane.add("Table", flightInfo.box());
+
+ vbox.add(pane);
this.add(vbox);
this.add(vbox);