projects
/
fw
/
altos
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
altosui/telegps: Switch to AltosUIIndicator and AltosUIFlightTab
[fw/altos]
/
altosui
/
AltosFlightStatus.java
diff --git
a/altosui/AltosFlightStatus.java
b/altosui/AltosFlightStatus.java
index b27deba903a589af3c3b86cb29c23920ed886083..46c0b38736d5c9d4c53bf1c1519634ebee9765b4 100644
(file)
--- a/
altosui/AltosFlightStatus.java
+++ b/
altosui/AltosFlightStatus.java
@@
-25,11
+25,21
@@
import org.altusmetrum.altosuilib_2.*;
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
GridBagLayout layout;
- public class FlightValue {
+ public
abstract
class FlightValue {
JLabel label;
JTextField value;
JLabel label;
JTextField value;
- void show(AltosState state, AltosListenerState listener_state) {}
+ void show() {
+ label.setVisible(true);
+ value.setVisible(true);
+ }
+
+ void hide() {
+ label.setVisible(false);
+ value.setVisible(false);
+ }
+
+ abstract void show(AltosState state, AltosListenerState listener_state);
void reset() {
value.setText("");
void reset() {
value.setText("");
@@
-83,6
+93,7
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
void show(AltosState state, AltosListenerState listener_state) {
if (!same_call(state.callsign)) {
void show(AltosState state, AltosListenerState listener_state) {
if (!same_call(state.callsign)) {
+ show();
value.setText(state.callsign);
if (state.callsign == null)
setVisible(false);
value.setText(state.callsign);
if (state.callsign == null)
setVisible(false);
@@
-91,6
+102,12
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
last_call = state.callsign;
}
}
last_call = state.callsign;
}
}
+
+ public void reset() {
+ super.reset();
+ last_call = "";
+ }
+
public Call (GridBagLayout layout, int x) {
super (layout, x, "Callsign");
}
public Call (GridBagLayout layout, int x) {
super (layout, x, "Callsign");
}
@@
-103,6
+120,7
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
int last_serial = -1;
void show(AltosState state, AltosListenerState listener_state) {
if (state.serial != last_serial) {
int last_serial = -1;
void show(AltosState state, AltosListenerState listener_state) {
if (state.serial != last_serial) {
+ show();
if (state.serial == AltosLib.MISSING)
value.setText("none");
else
if (state.serial == AltosLib.MISSING)
value.setText("none");
else
@@
-110,6
+128,12
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
last_serial = state.serial;
}
}
last_serial = state.serial;
}
}
+
+ public void reset() {
+ super.reset();
+ last_serial = -1;
+ }
+
public Serial (GridBagLayout layout, int x) {
super (layout, x, "Serial");
}
public Serial (GridBagLayout layout, int x) {
super (layout, x, "Serial");
}
@@
-123,6
+147,7
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
void show(AltosState state, AltosListenerState listener_state) {
if (state.flight != last_flight) {
void show(AltosState state, AltosListenerState listener_state) {
if (state.flight != last_flight) {
+ show();
if (state.flight == AltosLib.MISSING)
value.setText("none");
else
if (state.flight == AltosLib.MISSING)
value.setText("none");
else
@@
-130,6
+155,12
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
last_flight = state.flight;
}
}
last_flight = state.flight;
}
}
+
+ public void reset() {
+ super.reset();
+ last_flight = -1;
+ }
+
public Flight (GridBagLayout layout, int x) {
super (layout, x, "Flight");
}
public Flight (GridBagLayout layout, int x) {
super (layout, x, "Flight");
}
@@
-143,10
+174,21
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
void show(AltosState state, AltosListenerState listener_state) {
if (state.state != last_state) {
void show(AltosState state, AltosListenerState listener_state) {
if (state.state != last_state) {
- value.setText(state.state_name());
+ if (state.state == AltosLib.ao_flight_stateless)
+ hide();
+ else {
+ show();
+ value.setText(state.state_name());
+ }
last_state = state.state;
}
}
last_state = state.state;
}
}
+
+ public void reset() {
+ super.reset();
+ last_state = -1;
+ }
+
public FlightState (GridBagLayout layout, int x) {
super (layout, x, "State");
}
public FlightState (GridBagLayout layout, int x) {
super (layout, x, "State");
}
@@
-160,6
+202,7
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
void show(AltosState state, AltosListenerState listener_state) {
if (state.rssi() != last_rssi) {
void show(AltosState state, AltosListenerState listener_state) {
if (state.rssi() != last_rssi) {
+ show();
value.setText(String.format("%d", state.rssi()));
if (state.rssi == AltosLib.MISSING)
setVisible(false);
value.setText(String.format("%d", state.rssi()));
if (state.rssi == AltosLib.MISSING)
setVisible(false);
@@
-168,6
+211,12
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
last_rssi = state.rssi();
}
}
last_rssi = state.rssi();
}
}
+
+ public void reset() {
+ super.reset();
+ last_rssi = 10000;
+ }
+
public RSSI (GridBagLayout layout, int x) {
super (layout, x, "RSSI");
}
public RSSI (GridBagLayout layout, int x) {
super (layout, x, "RSSI");
}
@@
-186,6
+235,12
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
last_secs = secs;
}
}
last_secs = secs;
}
}
+
+ public void reset() {
+ super.reset();
+ last_secs = -1;
+ }
+
public LastPacket(GridBagLayout layout, int x) {
super (layout, x, "Age");
}
public LastPacket(GridBagLayout layout, int x) {
super (layout, x, "Age");
}
@@
-228,6
+283,8
@@
public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
return d.height;
}
return d.height;
}
+ public String getName() { return "Flight Status"; }
+
public AltosFlightStatus() {
layout = new GridBagLayout();
public AltosFlightStatus() {
layout = new GridBagLayout();