diff options
| author | Keith Packard <keithp@keithp.com> | 2015-09-12 19:20:49 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2015-10-13 13:54:28 -0700 |
| commit | 0afa07d3c1dcb5e301fcb8b4edfecdd961662478 (patch) | |
| tree | bd0742a81d3ef60933358fa5151e5d49910cacbe /altosui | |
| parent | 7064bc685aebeef07711e525dea4d5fbe33d235b (diff) | |
altoslib: Hide 'state' member and use accessor function
Someone was smashing the state to 'landed' when no packets had been
received for a while. Found that by making it impossible for anyone
outside of AltosState to change the value.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosui')
| -rw-r--r-- | altosui/AltosFlightStatus.java | 6 | ||||
| -rw-r--r-- | altosui/AltosFlightUI.java | 10 | ||||
| -rw-r--r-- | altosui/AltosPad.java | 10 | ||||
| -rw-r--r-- | altosui/AltosUI.java | 2 |
4 files changed, 14 insertions, 14 deletions
diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java index 815a6fa4..f44e2616 100644 --- a/altosui/AltosFlightStatus.java +++ b/altosui/AltosFlightStatus.java @@ -173,14 +173,14 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay int last_state = -1; void show(AltosState state, AltosListenerState listener_state) { - if (state.state != last_state) { - if (state.state == AltosLib.ao_flight_stateless) + if (state.state() != last_state) { + if (state.state() == AltosLib.ao_flight_stateless) hide(); else { show(); value.setText(state.state_name()); } - last_state = state.state; + last_state = state.state(); } } diff --git a/altosui/AltosFlightUI.java b/altosui/AltosFlightUI.java index db33e0d9..939c4688 100644 --- a/altosui/AltosFlightUI.java +++ b/altosui/AltosFlightUI.java @@ -53,13 +53,13 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay { JComponent cur_tab = null; JComponent which_tab(AltosState state) { - if (state.state < Altos.ao_flight_boost) + if (state.state() < Altos.ao_flight_boost) return pad; - if (state.state <= Altos.ao_flight_coast) + if (state.state() <= Altos.ao_flight_coast) return ascent; - if (state.state <= Altos.ao_flight_main) + if (state.state() <= Altos.ao_flight_main) return descent; - if (state.state == AltosLib.ao_flight_stateless) + if (state.state() == AltosLib.ao_flight_stateless) return descent; return landed; } @@ -102,7 +102,7 @@ public class AltosFlightUI extends AltosUIFrame implements AltosFlightDisplay { if (state == null) state = new AltosState(); - if (state.state != Altos.ao_flight_startup) { + if (state.state() != Altos.ao_flight_startup) { if (!has_state) { pane.setTitleAt(0, "Launch Pad"); pane.add(ascent, 1); diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java index 2f87b681..d056e256 100644 --- a/altosui/AltosPad.java +++ b/altosui/AltosPad.java @@ -49,10 +49,10 @@ public class AltosPad extends AltosUIFlightTab { hide(); } else { if (state.flight != 0) { - if (state.state <= Altos.ao_flight_pad) + if (state.state() <= Altos.ao_flight_pad) show("Ready to record"); - else if (state.state < Altos.ao_flight_landed || - state.state == AltosLib.ao_flight_stateless) + else if (state.state() < Altos.ao_flight_landed || + state.state() == AltosLib.ao_flight_stateless) show("Recording data"); else show("Recorded data"); @@ -121,8 +121,8 @@ public class AltosPad extends AltosUIFlightTab { } boolean report_pad(AltosState state) { - if ((state.state == AltosLib.ao_flight_stateless || - state.state < AltosLib.ao_flight_pad) && + if ((state.state() == AltosLib.ao_flight_stateless || + state.state() < AltosLib.ao_flight_pad) && state.gps != null && state.gps.lat != AltosLib.MISSING) { diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java index f6caa4ef..c29f0db3 100644 --- a/altosui/AltosUI.java +++ b/altosui/AltosUI.java @@ -539,7 +539,7 @@ public class AltosUI extends AltosUIFrame { System.out.printf ("process cat\n"); for (AltosState state : eef) { System.out.printf ("tick %d state %d height %g\n", - state.tick, state.state, state.height()); + state.tick, state.state(), state.height()); if ((state.set & AltosState.set_gps) != 0) System.out.printf ("time %g lat %g lon %g alt %g\n", state.time_since_boost(), |