X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigUI.java;h=cb7af82971d163ed06772711739c6be8b618af5c;hp=76837b31159d2e0fd31ec12ea59acb581f2de29e;hb=f28db1102685c87b9f4278268f7e91f5df18374a;hpb=d6445b3739ac2c5dd040efdb97317a6b2a48044a diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java index 76837b31..cb7af829 100644 --- a/altosui/AltosConfigUI.java +++ b/altosui/AltosConfigUI.java @@ -22,8 +22,8 @@ import java.awt.event.*; import javax.swing.*; import javax.swing.event.*; import java.text.*; -import org.altusmetrum.altoslib_8.*; -import org.altusmetrum.altosuilib_8.*; +import org.altusmetrum.altoslib_11.*; +import org.altusmetrum.altosuilib_11.*; public class AltosConfigUI extends AltosUIDialog @@ -63,7 +63,7 @@ public class AltosConfigUI JComboBox apogee_delay_value; JComboBox apogee_lockout_value; AltosUIFreqList radio_frequency_value; - JTextField radio_calibration_value; + JLabel radio_calibration_value; JRadioButton radio_enable_value; AltosUIRateList rate_value; JComboBox aprs_interval_value; @@ -191,13 +191,6 @@ public class AltosConfigUI return product != null && product.startsWith("TeleMetrum"); } - void set_radio_calibration_tool_tip() { - if (radio_calibration_value.isEnabled()) - radio_calibration_value.setToolTipText("Tune radio output to match desired frequency"); - else - radio_calibration_value.setToolTipText("Cannot tune radio while connected over packet mode"); - } - void set_radio_enable_tool_tip() { if (radio_enable_value.isEnabled()) radio_enable_value.setToolTipText("Enable/Disable telemetry and RDF transmissions"); @@ -478,12 +471,8 @@ public class AltosConfigUI c.anchor = GridBagConstraints.LINE_START; c.insets = ir; c.ipady = 5; - radio_calibration_value = new JTextField(String.format("%d", 1186611)); - radio_calibration_value.getDocument().addDocumentListener(this); - if (remote) - radio_calibration_value.setEnabled(false); + radio_calibration_value = new JLabel(String.format("%d", 1186611)); pane.add(radio_calibration_value, c); - set_radio_calibration_tool_tip(); row++; /* Radio Enable */ @@ -987,7 +976,7 @@ public class AltosConfigUI } String get_main_deploy_label() { - return String.format("Main Deploy Altitude(%s):", AltosConvert.height.show_units()); + return String.format("Main Deploy Altitude(%s):", AltosConvert.height.parse_units()); } String[] main_deploy_values() { @@ -1087,10 +1076,6 @@ public class AltosConfigUI radio_calibration_value.setText(String.format("%d", new_radio_calibration)); } - public int radio_calibration() throws AltosConfigDataException { - return parse_int("radio calibration", radio_calibration_value.getText(), false); - } - public void set_radio_enable(int new_radio_enable) { radio_enable_label.setVisible(new_radio_enable >= 0); radio_enable_value.setVisible(new_radio_enable >= 0); @@ -1258,7 +1243,7 @@ public class AltosConfigUI } String get_tracker_motion_label() { - return String.format("Logging Trigger Motion (%s):", AltosConvert.height.show_units()); + return String.format("Logging Trigger Motion (%s):", AltosConvert.height.parse_units()); } void set_tracker_tool_tip() {