diff options
| author | Keith Packard <keithp@keithp.com> | 2017-05-25 17:26:49 -0700 |
|---|---|---|
| committer | Keith Packard <keithp@keithp.com> | 2017-05-25 17:26:49 -0700 |
| commit | e6eb659b0e984515a33b3ddabfe8325742a952da (patch) | |
| tree | 20d1f82d9c3f03833b15201e030770bdfc8ec7c8 /altosuilib/AltosInfoTable.java | |
| parent | f26cfe417c6977cf1e7e75a4f050e25f64d41859 (diff) | |
altosuilib: Adapt to AltosFlightSeries data processing plan
Replace use of list of AltosState with AltosFlightSeries to improve
data analysis.
Signed-off-by: Keith Packard <keithp@keithp.com>
Diffstat (limited to 'altosuilib/AltosInfoTable.java')
| -rw-r--r-- | altosuilib/AltosInfoTable.java | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/altosuilib/AltosInfoTable.java b/altosuilib/AltosInfoTable.java index 7ede2824..c1ac774e 100644 --- a/altosuilib/AltosInfoTable.java +++ b/altosuilib/AltosInfoTable.java @@ -128,6 +128,8 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar public void show(AltosState state, AltosListenerState listener_state) { + AltosCalData cal_data = state.cal_data; + if (!isShowing()) { last_state = state; last_listener_state = listener_state; @@ -136,14 +138,14 @@ public class AltosInfoTable extends JTable implements AltosFlightDisplay, Hierar reset(); if (state != null) { - if (state.device_type != AltosLib.MISSING) - info_add_row(0, "Device", "%s", AltosLib.product_name(state.device_type)); - else if (state.product != null) - info_add_row(0, "Device", "%s", state.product); + if (cal_data.device_type != AltosLib.MISSING) + info_add_row(0, "Device", "%s", AltosLib.product_name(cal_data.device_type)); + else if (cal_data.product != null) + info_add_row(0, "Device", "%s", cal_data.product); if (state.altitude() != AltosLib.MISSING) info_add_row(0, "Altitude", "%6.0f m", state.altitude()); - if (state.ground_altitude() != AltosLib.MISSING) - info_add_row(0, "Pad altitude", "%6.0f m", state.ground_altitude()); + if (cal_data.ground_altitude != AltosLib.MISSING) + info_add_row(0, "Pad altitude", "%6.0f m", cal_data.ground_altitude); if (state.height() != AltosLib.MISSING) info_add_row(0, "Height", "%6.0f m", state.height()); if (state.max_height() != AltosLib.MISSING) |