From 6b5e5899d174466552a34a4d8574f0439776240d Mon Sep 17 00:00:00 2001 From: Keith Packard Date: Sun, 2 Aug 2020 13:31:58 -0700 Subject: [PATCH] altosui: Re-set pad orientation labels after product name is set We don't know what product is being configured until after we query the configuration, which means we need to re-set the orientation label once that has been fetched. Signed-off-by: Keith Packard --- altosui/AltosConfigFCUI.java | 22 ++++++++++++++++++---- 1 file changed, 18 insertions(+), 4 deletions(-) diff --git a/altosui/AltosConfigFCUI.java b/altosui/AltosConfigFCUI.java index 3b11fb68..5143b837 100644 --- a/altosui/AltosConfigFCUI.java +++ b/altosui/AltosConfigFCUI.java @@ -311,6 +311,22 @@ public class AltosConfigFCUI } } + void set_pad_orientation_values() { + String [] new_values; + if (has_radio()) + new_values = pad_orientation_values_radio; + else + new_values = pad_orientation_values_no_radio; + if (new_values != pad_orientation_values) { + int id = pad_orientation_value.getSelectedIndex(); + pad_orientation_value.removeAllItems(); + pad_orientation_values = new_values; + for (int i = 0; i < new_values.length; i++) + pad_orientation_value.addItem(pad_orientation_values[i]); + pad_orientation_value.setSelectedIndex(id); + } + } + void set_accel_tool_tips() { if (accel_plus_value.isVisible()) { accel_plus_value.setToolTipText("Pad acceleration value in flight orientation"); @@ -788,10 +804,7 @@ public class AltosConfigFCUI c.anchor = GridBagConstraints.LINE_START; c.insets = ir; c.ipady = 5; - if (has_radio()) - pad_orientation_values = pad_orientation_values_radio; - else - pad_orientation_values = pad_orientation_values_no_radio; + pad_orientation_values = pad_orientation_values_no_radio; pad_orientation_value = new JComboBox(pad_orientation_values); pad_orientation_value.setEditable(false); @@ -1102,6 +1115,7 @@ public class AltosConfigFCUI set_pad_orientation_tool_tip(); set_accel_tool_tips(); set_flight_log_max_tool_tip(); + set_pad_orientation_values(); } public void set_version(String version) { -- 2.30.2