altosui: Hide non-applicable altimeter config values

[fw/altos] / altosui / AltosConfigUI.java

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index a6d27977cd5d41b211f6c1d511adf8e8287b2633..a7d95903ae25d828dc14c214419ed492fdcf3e38 100644 (file)
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -185,7 +185,7 @@ public class AltosConfigUI
 
        void set_pad_orientation_tool_tip() {
                if (pad_orientation_value.isEnabled())
-                       pad_orientation_value.setToolTipText("How will TeleMetrum be mounted in the airframe");
+                       pad_orientation_value.setToolTipText("How will the computer be mounted in the airframe");
                else {
                        if (is_telemetrum())
                                pad_orientation_value.setToolTipText("Older TeleMetrum firmware must fly antenna forward");
@@ -198,7 +198,7 @@ public class AltosConfigUI
 
        /* Build the UI using a grid bag */
        public AltosConfigUI(JFrame in_owner, boolean remote) {
-               super (in_owner, "Configure TeleMetrum", false);
+               super (in_owner, "Configure Flight Computer", false);
 
                owner = in_owner;
                GridBagConstraints c;
@@ -661,7 +661,10 @@ public class AltosConfigUI
        AltosConfigPyroUI       pyro_ui;
 
        public void dispose() {
+               if (pyro_ui != null)
+                       pyro_ui.dispose();
                AltosPreferences.unregister_units_listener(this);
+               super.dispose();
        }
 
        /* Listen for events from our buttons */
@@ -669,10 +672,10 @@ public class AltosConfigUI
                String  cmd = e.getActionCommand();
 
                if (cmd.equals("Pyro")) {
-                       if (pyro_ui == null && pyros != null) {
+                       if (pyro_ui == null && pyros != null)
                                pyro_ui = new AltosConfigPyroUI(this, pyros);
+                       if (pyro_ui != null)
                                pyro_ui.make_visible();
-                       }
                        return;
                }
 
@@ -757,9 +760,11 @@ public class AltosConfigUI
        }
        
        public void units_changed(boolean imperial_units) {
+               String v = main_deploy_value.getSelectedItem().toString();
                main_deploy_label.setText(get_main_deploy_label());
                set_main_deploy_values();
-               listener.actionPerformed(new ActionEvent(this, 0, "Reset"));
+               int m = (int) (AltosConvert.height.parse(v, !imperial_units) + 0.5);
+               set_main_deploy(m);
        }
 
        public void set_apogee_delay(int new_apogee_delay) {
@@ -781,28 +786,7 @@ public class AltosConfigUI
        }
 
        public void set_radio_frequency(double new_radio_frequency) {
-               int i;
-               for (i = 0; i < radio_frequency_value.getItemCount(); i++) {
-                       AltosFrequency  f = (AltosFrequency) radio_frequency_value.getItemAt(i);
-                       
-                       if (f.close(new_radio_frequency)) {
-                               radio_frequency_value.setSelectedIndex(i);
-                               return;
-                       }
-               }
-               for (i = 0; i < radio_frequency_value.getItemCount(); i++) {
-                       AltosFrequency  f = (AltosFrequency) radio_frequency_value.getItemAt(i);
-                       
-                       if (new_radio_frequency < f.frequency)
-                               break;
-               }
-               String  description = String.format("%s serial %s",
-                                                   product_value.getText(),
-                                                   serial_value.getText());
-               AltosFrequency  new_frequency = new AltosFrequency(new_radio_frequency, description);
-               AltosUIPreferences.add_common_frequency(new_frequency);
-               radio_frequency_value.insertItemAt(new_frequency, i);
-               radio_frequency_value.setSelectedIndex(i);
+               radio_frequency_value.set_frequency(new_radio_frequency);
        }
 
        public double radio_frequency() {
@@ -810,7 +794,11 @@ public class AltosConfigUI
        }
 
        public void set_radio_calibration(int new_radio_calibration) {
-               radio_calibration_value.setText(String.format("%d", new_radio_calibration));
+               radio_calibration_value.setVisible(new_radio_calibration >= 0);
+               if (new_radio_calibration < 0)
+                       radio_calibration_value.setText("Disabled");
+               else
+                       radio_calibration_value.setText(String.format("%d", new_radio_calibration));
        }
 
        public int radio_calibration() {
@@ -823,6 +811,7 @@ public class AltosConfigUI
                        radio_enable_value.setEnabled(true);
                } else {
                        radio_enable_value.setSelected(true);
+                       radio_enable_value.setVisible(radio_frequency() > 0);
                        radio_enable_value.setEnabled(false);
                }
                set_radio_enable_tool_tip();
@@ -836,6 +825,7 @@ public class AltosConfigUI
        }
 
        public void set_callsign(String new_callsign) {
+               callsign_value.setVisible(new_callsign != null);
                callsign_value.setText(new_callsign);
        }
 
@@ -895,10 +885,10 @@ public class AltosConfigUI
                if (new_pad_orientation >= pad_orientation_values.length)
                        new_pad_orientation = 0;
                if (new_pad_orientation < 0) {
-                       pad_orientation_value.setEnabled(false);
+                       pad_orientation_value.setVisible(false);
                        new_pad_orientation = 0;
                } else {
-                       pad_orientation_value.setEnabled(true);
+                       pad_orientation_value.setVisible(true);
                }
                pad_orientation_value.setSelectedIndex(new_pad_orientation);
                set_pad_orientation_tool_tip();
@@ -913,7 +903,7 @@ public class AltosConfigUI
 
        public void set_pyros(AltosPyro[] new_pyros) {
                pyros = new_pyros;
-               pyro.setEnabled(pyros != null);
+               pyro.setVisible(pyros != null);
                if (pyros != null && pyro_ui != null)
                        pyro_ui.set_pyros(pyros);
        }
@@ -932,7 +922,7 @@ public class AltosConfigUI
                else
                        s = Integer.toString(new_aprs_interval);
                aprs_interval_value.setSelectedItem(s);
-               aprs_interval_value.setEnabled(new_aprs_interval >= 0);
+               aprs_interval_value.setVisible(new_aprs_interval >= 0);
                set_aprs_interval_tool_tip();
        }