X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigUI.java;h=f936d92c19ee9dc487c671e29b4d886f782e6a53;hp=7f4e1eb00280187b22664e53ea40d5eb2329994e;hb=ae1174317fc476e39077f7dc257ec08709c6b301;hpb=4ac7797d3efb9cc2d9fae88519f55e40b1050224 diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java index 7f4e1eb0..f936d92c 100644 --- a/altosui/AltosConfigUI.java +++ b/altosui/AltosConfigUI.java @@ -21,8 +21,8 @@ import java.awt.*; import java.awt.event.*; import javax.swing.*; import javax.swing.event.*; -import org.altusmetrum.altoslib_3.*; -import org.altusmetrum.altosuilib_1.*; +import org.altusmetrum.altoslib_4.*; +import org.altusmetrum.altosuilib_2.*; public class AltosConfigUI extends AltosUIDialog @@ -46,6 +46,8 @@ public class AltosConfigUI JLabel pad_orientation_label; JLabel callsign_label; JLabel beep_label; + JLabel tracker_horiz_label; + JLabel tracker_vert_label; public boolean dirty; @@ -65,6 +67,8 @@ public class AltosConfigUI JComboBox pad_orientation_value; JTextField callsign_value; JComboBox beep_value; + JComboBox tracker_horiz_value; + JComboBox tracker_vert_value; JButton pyro; @@ -95,12 +99,6 @@ public class AltosConfigUI "0", "5", "10", "15", "20" }; - static String[] flight_log_max_values = { - "64", "128", "192", "256", "320", - "384", "448", "512", "576", "640", - "704", "768", "832", "896", "960", - }; - static String[] ignite_mode_values = { "Dual Deploy", "Redundant Apogee", @@ -125,6 +123,34 @@ public class AltosConfigUI "Antenna Down", }; + static String[] tracker_horiz_values_m = { + "250", + "500", + "1000", + "2000" + }; + + static String[] tracker_horiz_values_ft = { + "500", + "1000", + "2500", + "5000" + }; + + static String[] tracker_vert_values_m = { + "25", + "50", + "100", + "200" + }; + + static String[] tracker_vert_values_ft = { + "50", + "100", + "250", + "500" + }; + /* A window listener to catch closing events and tell the config code */ class ConfigListener extends WindowAdapter { AltosConfigUI ui; @@ -514,7 +540,7 @@ public class AltosConfigUI c.anchor = GridBagConstraints.LINE_START; c.insets = il; c.ipady = 5; - flight_log_max_label = new JLabel("Maximum Flight Log Size:"); + flight_log_max_label = new JLabel("Maximum Flight Log Size (kB):"); pane.add(flight_log_max_label, c); c = new GridBagConstraints(); @@ -525,7 +551,7 @@ public class AltosConfigUI c.anchor = GridBagConstraints.LINE_START; c.insets = ir; c.ipady = 5; - flight_log_max_value = new JComboBox(flight_log_max_values); + flight_log_max_value = new JComboBox(); flight_log_max_value.setEditable(true); flight_log_max_value.addItemListener(this); pane.add(flight_log_max_value, c); @@ -610,6 +636,57 @@ public class AltosConfigUI set_beep_tool_tip(); row++; + /* Tracker triger horiz distances */ + c = new GridBagConstraints(); + c.gridx = 0; c.gridy = row; + c.gridwidth = 4; + c.fill = GridBagConstraints.NONE; + c.anchor = GridBagConstraints.LINE_START; + c.insets = il; + c.ipady = 5; + tracker_horiz_label = new JLabel(get_tracker_horiz_label()); + pane.add(tracker_horiz_label, c); + + c = new GridBagConstraints(); + c.gridx = 4; c.gridy = row; + c.gridwidth = 4; + c.fill = GridBagConstraints.HORIZONTAL; + c.weightx = 1; + c.anchor = GridBagConstraints.LINE_START; + c.insets = ir; + c.ipady = 5; + tracker_horiz_value = new JComboBox(tracker_horiz_values()); + tracker_horiz_value.setEditable(true); + tracker_horiz_value.addItemListener(this); + pane.add(tracker_horiz_value, c); + row++; + + /* Tracker triger vert distances */ + c = new GridBagConstraints(); + c.gridx = 0; c.gridy = row; + c.gridwidth = 4; + c.fill = GridBagConstraints.NONE; + c.anchor = GridBagConstraints.LINE_START; + c.insets = il; + c.ipady = 5; + tracker_vert_label = new JLabel(get_tracker_vert_label()); + pane.add(tracker_vert_label, c); + + c = new GridBagConstraints(); + c.gridx = 4; c.gridy = row; + c.gridwidth = 4; + c.fill = GridBagConstraints.HORIZONTAL; + c.weightx = 1; + c.anchor = GridBagConstraints.LINE_START; + c.insets = ir; + c.ipady = 5; + tracker_vert_value = new JComboBox(tracker_vert_values()); + tracker_vert_value.setEditable(true); + tracker_vert_value.addItemListener(this); + pane.add(tracker_vert_value, c); + set_tracker_tool_tip(); + row++; + /* Pyro channels */ c = new GridBagConstraints(); c.gridx = 4; c.gridy = row; @@ -814,6 +891,20 @@ public class AltosConfigUI set_main_deploy_values(); int m = (int) (AltosConvert.height.parse(v, !imperial_units) + 0.5); set_main_deploy(m); + + if (tracker_horiz_value.isEnabled() && tracker_vert_value.isEnabled()) { + String th = tracker_horiz_value.getSelectedItem().toString(); + String tv = tracker_vert_value.getSelectedItem().toString(); + tracker_horiz_label.setText(get_tracker_horiz_label()); + tracker_vert_label.setText(get_tracker_vert_label()); + set_tracker_horiz_values(); + set_tracker_vert_values(); + int[] t = { + (int) (AltosConvert.height.parse(th, !imperial_units) + 0.5), + (int) (AltosConvert.height.parse(tv, !imperial_units) + 0.5) + }; + set_tracker_distances(t); + } } public void set_apogee_delay(int new_apogee_delay) { @@ -821,8 +912,19 @@ public class AltosConfigUI apogee_delay_value.setEnabled(new_apogee_delay >= 0); } - public int apogee_delay() { - return Integer.parseInt(apogee_delay_value.getSelectedItem().toString()); + private int parse_int(String name, String s, boolean split) throws AltosConfigDataException { + String v = s; + if (split) + v = s.split("\\s+")[0]; + try { + return Integer.parseInt(v); + } catch (NumberFormatException ne) { + throw new AltosConfigDataException("Invalid %s \"%s\"", name, s); + } + } + + public int apogee_delay() throws AltosConfigDataException { + return parse_int("apogee delay", apogee_delay_value.getSelectedItem().toString(), false); } public void set_apogee_lockout(int new_apogee_lockout) { @@ -830,8 +932,8 @@ public class AltosConfigUI apogee_lockout_value.setEnabled(new_apogee_lockout >= 0); } - public int apogee_lockout() { - return Integer.parseInt(apogee_lockout_value.getSelectedItem().toString()); + public int apogee_lockout() throws AltosConfigDataException { + return parse_int("apogee lockout", apogee_lockout_value.getSelectedItem().toString(), false); } public void set_radio_frequency(double new_radio_frequency) { @@ -850,8 +952,8 @@ public class AltosConfigUI radio_calibration_value.setText(String.format("%d", new_radio_calibration)); } - public int radio_calibration() { - return Integer.parseInt(radio_calibration_value.getText()); + 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) { @@ -882,8 +984,22 @@ public class AltosConfigUI return callsign_value.getText(); } + int flight_log_max_limit; + int flight_log_max; + + public String flight_log_max_label(int flight_log_max) { + if (flight_log_max_limit != 0) { + int nflight = flight_log_max_limit / flight_log_max; + String plural = nflight > 1 ? "s" : ""; + + return String.format("%d (%d flight%s)", flight_log_max, nflight, plural); + } + return String.format("%d", flight_log_max); + } + public void set_flight_log_max(int new_flight_log_max) { - flight_log_max_value.setSelectedItem(Integer.toString(new_flight_log_max)); + flight_log_max_value.setSelectedItem(flight_log_max_label(new_flight_log_max)); + flight_log_max = new_flight_log_max; set_flight_log_max_tool_tip(); } @@ -892,20 +1008,19 @@ public class AltosConfigUI set_flight_log_max_tool_tip(); } - public int flight_log_max() { - return Integer.parseInt(flight_log_max_value.getSelectedItem().toString()); + public int flight_log_max() throws AltosConfigDataException { + return parse_int("flight log max", flight_log_max_value.getSelectedItem().toString(), true); } - public void set_flight_log_max_limit(int flight_log_max_limit) { - //boolean any_added = false; + public void set_flight_log_max_limit(int new_flight_log_max_limit) { + flight_log_max_limit = new_flight_log_max_limit; flight_log_max_value.removeAllItems(); - for (int i = 0; i < flight_log_max_values.length; i++) { - if (Integer.parseInt(flight_log_max_values[i]) < flight_log_max_limit){ - flight_log_max_value.addItem(flight_log_max_values[i]); - //any_added = true; - } + for (int i = 8; i >= 1; i--) { + int size = flight_log_max_limit / i; + flight_log_max_value.addItem(String.format("%d (%d flights)", size, i)); } - flight_log_max_value.addItem(String.format("%d", flight_log_max_limit)); + if (flight_log_max != 0) + set_flight_log_max(flight_log_max); } public void set_ignite_mode(int new_ignite_mode) { @@ -969,6 +1084,80 @@ public class AltosConfigUI return -1; } + String[] tracker_horiz_values() { + if (AltosConvert.imperial_units) + return tracker_horiz_values_ft; + else + return tracker_horiz_values_m; + } + + void set_tracker_horiz_values() { + String[] v = tracker_horiz_values(); + while (tracker_horiz_value.getItemCount() > 0) + tracker_horiz_value.removeItemAt(0); + for (int i = 0; i < v.length; i++) + tracker_horiz_value.addItem(v[i]); + tracker_horiz_value.setMaximumRowCount(v.length); + } + + String get_tracker_horiz_label() { + return String.format("Logging Trigger Horizontal (%s):", AltosConvert.height.show_units()); + } + + String[] tracker_vert_values() { + if (AltosConvert.imperial_units) + return tracker_vert_values_ft; + else + return tracker_vert_values_m; + } + + void set_tracker_vert_values() { + String[] v = tracker_vert_values(); + while (tracker_vert_value.getItemCount() > 0) + tracker_vert_value.removeItemAt(0); + for (int i = 0; i < v.length; i++) + tracker_vert_value.addItem(v[i]); + tracker_vert_value.setMaximumRowCount(v.length); + } + + void set_tracker_tool_tip() { + if (tracker_horiz_value.isEnabled()) + tracker_horiz_value.setToolTipText("How far the device must move before logging is enabled"); + else + tracker_horiz_value.setToolTipText("This device doesn't disable logging before motion"); + if (tracker_vert_value.isEnabled()) + tracker_vert_value.setToolTipText("How far the device must move before logging is enabled"); + else + tracker_vert_value.setToolTipText("This device doesn't disable logging before motion"); + } + + String get_tracker_vert_label() { + return String.format("Logging Trigger Vertical (%s):", AltosConvert.height.show_units()); + } + + public void set_tracker_distances(int[] tracker_distances) { + if (tracker_distances != null) { + tracker_horiz_value.setSelectedItem(AltosConvert.height.say(tracker_distances[0])); + tracker_vert_value.setSelectedItem(AltosConvert.height.say(tracker_distances[1])); + tracker_horiz_value.setEnabled(true); + tracker_vert_value.setEnabled(true); + } else { + tracker_horiz_value.setEnabled(false); + tracker_vert_value.setEnabled(false); + } + } + + public int[] tracker_distances() { + if (tracker_horiz_value.isEnabled() && tracker_vert_value.isEnabled()) { + int[] t = { + (int) (AltosConvert.height.parse(tracker_horiz_value.getSelectedItem().toString()) + 0.5), + (int) (AltosConvert.height.parse(tracker_vert_value.getSelectedItem().toString()) + 0.5), + }; + return t; + } + return null; + } + public void set_pyros(AltosPyro[] new_pyros) { pyros = new_pyros; pyro.setVisible(pyros != null); @@ -976,7 +1165,7 @@ public class AltosConfigUI pyro_ui.set_pyros(pyros); } - public AltosPyro[] pyros() { + public AltosPyro[] pyros() throws AltosConfigDataException { if (pyro_ui != null) pyros = pyro_ui.get_pyros(); return pyros; @@ -994,11 +1183,11 @@ public class AltosConfigUI set_aprs_interval_tool_tip(); } - public int aprs_interval() { + public int aprs_interval() throws AltosConfigDataException { String s = aprs_interval_value.getSelectedItem().toString(); if (s.equals("Disabled")) return 0; - return Integer.parseInt(s); + return parse_int("aprs interval", s, false); } }