diff options
| author | Bdale Garbee <bdale@gag.com> | 2016-05-06 17:59:39 -0600 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2016-05-06 17:59:39 -0600 |
| commit | ac7be4a40df88ee3a0992e041635e4ac4cf5ac48 (patch) | |
| tree | ee3c747b2ee98b772e02dce604b58878e9336def /altosui/AltosConfigUI.java | |
| parent | b53c78e75879d647935a30acb88fdd69467617a7 (diff) | |
| parent | ce4c8a8ad57515e851207b0a82f3af791bb30d3e (diff) | |
Merge branch 'master' into branch-1.6
Diffstat (limited to 'altosui/AltosConfigUI.java')
| -rw-r--r-- | altosui/AltosConfigUI.java | 23 |
1 files changed, 4 insertions, 19 deletions
diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java index a4216212..24167df3 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_9.*; -import org.altusmetrum.altosuilib_9.*; +import org.altusmetrum.altoslib_10.*; +import org.altusmetrum.altosuilib_10.*; public class AltosConfigUI extends AltosUIDialog @@ -63,7 +63,7 @@ public class AltosConfigUI JComboBox<String> apogee_delay_value; JComboBox<String> apogee_lockout_value; AltosUIFreqList radio_frequency_value; - JTextField radio_calibration_value; + JLabel radio_calibration_value; JRadioButton radio_enable_value; AltosUIRateList rate_value; JComboBox<String> 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 */ @@ -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); |