projects
/
fw
/
altos
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
ae55a10
)
altosui: don't switch away from user selected tab
author
Anthony Towns
<aj@erisian.com.au>
Tue, 23 Nov 2010 16:11:36 +0000
(
02:11
+1000)
committer
Anthony Towns
<aj@erisian.com.au>
Tue, 23 Nov 2010 16:11:36 +0000
(
02:11
+1000)
ao-tools/altosui/AltosFlightUI.java
patch
|
blob
|
history
diff --git
a/ao-tools/altosui/AltosFlightUI.java
b/ao-tools/altosui/AltosFlightUI.java
index 732f7395565eee41b2d0388c4474cd4f8ddb99b1..b0cc521dbfc86596efa49cbbb017d645b2b30615 100644
(file)
--- a/
ao-tools/altosui/AltosFlightUI.java
+++ b/
ao-tools/altosui/AltosFlightUI.java
@@
-47,23
+47,17
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
private AltosFlightStatus flightStatus;
private AltosInfoTable flightInfo;
- static final int tab_pad = 1;
- static final int tab_ascent = 2;
- static final int tab_descent = 3;
- static final int tab_landed = 4;
-
- int cur_tab = 0;
-
boolean exit_on_close = false;
boolean exit_on_close = false;
- int which_tab(AltosState state) {
+ JComponent cur_tab = null;
+ JComponent which_tab(AltosState state) {
if (state.state < Altos.ao_flight_boost)
if (state.state < Altos.ao_flight_boost)
- return
tab_
pad;
+ return pad;
if (state.state <= Altos.ao_flight_coast)
if (state.state <= Altos.ao_flight_coast)
- return
tab_
ascent;
+ return ascent;
if (state.state <= Altos.ao_flight_main)
if (state.state <= Altos.ao_flight_main)
- return
tab_
descent;
- return
tab_
landed;
+ return descent;
+ return landed;
}
void stop_display() {
}
void stop_display() {
@@
-90,24
+84,14
@@
public class AltosFlightUI extends JFrame implements AltosFlightDisplay {
}
public void show(AltosState state, int crc_errors) {
}
public void show(AltosState state, int crc_errors) {
-
int
tab = which_tab(state);
+
JComponent
tab = which_tab(state);
pad.show(state, crc_errors);
ascent.show(state, crc_errors);
descent.show(state, crc_errors);
landed.show(state, crc_errors);
if (tab != cur_tab) {
pad.show(state, crc_errors);
ascent.show(state, crc_errors);
descent.show(state, crc_errors);
landed.show(state, crc_errors);
if (tab != cur_tab) {
- switch (tab) {
- case tab_pad:
- pane.setSelectedComponent(pad);
- break;
- case tab_ascent:
- pane.setSelectedComponent(ascent);
- break;
- case tab_descent:
- pane.setSelectedComponent(descent);
- break;
- case tab_landed:
- pane.setSelectedComponent(landed);
+ if (cur_tab == pane.getSelectedComponent()) {
+ pane.setSelectedComponent(tab);
}
cur_tab = tab;
}
}
cur_tab = tab;
}