X-Git-Url: https://git.gag.com/?a=blobdiff_plain;ds=sidebyside;f=altosui%2FAltosConfigUI.java;h=2c3435c18a47494834663d00c1626c9041399dc8;hb=688a9458bb03a81e71554c14295d1baacbbbd530;hp=dd34a9cf348c84dbbb4a219652527f2e0db0c5a8;hpb=ce1b19a012a2c1c623b03efb93b881e297736718;p=fw%2Faltos

diff --git a/altosui/AltosConfigUI.java b/altosui/AltosConfigUI.java
index dd34a9cf..2c3435c1 100644
--- a/altosui/AltosConfigUI.java
+++ b/altosui/AltosConfigUI.java
@@ -25,11 +25,10 @@ import org.altusmetrum.AltosLib.*;
 
 public class AltosConfigUI
 	extends AltosDialog
-	implements ActionListener, ItemListener, DocumentListener
+	implements ActionListener, ItemListener, DocumentListener, AltosConfigValues
 {
 
 	Container	pane;
-	Box		box;
 	JLabel		product_label;
 	JLabel		version_label;
 	JLabel		serial_label;
@@ -62,11 +61,15 @@ public class AltosConfigUI
 	JComboBox	pad_orientation_value;
 	JTextField	callsign_value;
 
+	JButton		pyro;
+
 	JButton		save;
 	JButton		reset;
 	JButton		reboot;
 	JButton		close;
 
+	AltosPyro[]	pyros;
+
 	ActionListener	listener;
 
 	static String[] main_deploy_values = {
@@ -510,6 +513,20 @@ public class AltosConfigUI
 		set_pad_orientation_tool_tip();
 		row++;
 
+		/* Pyro channels */
+		c = new GridBagConstraints();
+		c.gridx = 4; c.gridy = row;
+		c.gridwidth = 4;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = il;
+		c.ipady = 5;
+		pyro = new JButton("Configure Pyro Channels");
+		pane.add(pyro, c);
+		pyro.addActionListener(this);
+		pyro.setActionCommand("Pyro");
+		row++;
+
 		/* Buttons */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = row;
@@ -582,10 +599,30 @@ public class AltosConfigUI
 		return true;
 	}
 
+	void set_dirty() {
+		dirty = true;
+		save.setEnabled(true);
+	}
+
+	public void set_clean() {
+		dirty = false;
+		save.setEnabled(false);
+	}
+
+	AltosConfigPyroUI	pyro_ui;
+
 	/* Listen for events from our buttons */
 	public void actionPerformed(ActionEvent e) {
 		String	cmd = e.getActionCommand();
 
+		if (cmd.equals("Pyro")) {
+			if (pyro_ui == null && pyros != null) {
+				pyro_ui = new AltosConfigPyroUI(this, pyros);
+				pyro_ui.make_visible();
+			}
+			return;
+		}
+
 		if (cmd.equals("Close") || cmd.equals("Reboot"))
 			if (!check_dirty(cmd))
 				return;
@@ -594,25 +631,25 @@ public class AltosConfigUI
 			setVisible(false);
 			dispose();
 		}
-		dirty = false;
+		set_clean();
 	}
 
 	/* ItemListener interface method */
 	public void itemStateChanged(ItemEvent e) {
-		dirty = true;
+		set_dirty();
 	}
 
 	/* DocumentListener interface methods */
 	public void changedUpdate(DocumentEvent e) {
-		dirty = true;
+		set_dirty();
 	}
 
 	public void insertUpdate(DocumentEvent e) {
-		dirty = true;
+		set_dirty();
 	}
 
 	public void removeUpdate(DocumentEvent e) {
-		dirty = true;
+		set_dirty();
 	}
 
 	/* Let the config code hook on a listener */
@@ -647,6 +684,7 @@ public class AltosConfigUI
 
 	public void set_apogee_delay(int new_apogee_delay) {
 		apogee_delay_value.setSelectedItem(Integer.toString(new_apogee_delay));
+		apogee_delay_value.setEnabled(new_apogee_delay >= 0);
 	}
 
 	public int apogee_delay() {
@@ -655,6 +693,7 @@ public class AltosConfigUI
 
 	public void set_apogee_lockout(int new_apogee_lockout) {
 		apogee_lockout_value.setSelectedItem(Integer.toString(new_apogee_lockout));
+		apogee_lockout_value.setEnabled(new_apogee_lockout >= 0);
 	}
 
 	public int apogee_lockout() {
@@ -725,8 +764,7 @@ public class AltosConfigUI
 	}
 
 	public void set_flight_log_max(int new_flight_log_max) {
-		if (new_flight_log_max == 0)
-			flight_log_max_value.setEnabled(false);
+		flight_log_max_value.setEnabled(new_flight_log_max > 0);
 		flight_log_max_value.setSelectedItem(Integer.toString(new_flight_log_max));
 		set_flight_log_max_tool_tip();
 	}
@@ -793,7 +831,16 @@ public class AltosConfigUI
 			return -1;
 	}
 
-	public void set_clean() {
-		dirty = false;
+	public void set_pyros(AltosPyro[] new_pyros) {
+		pyros = new_pyros;
+		pyro.setEnabled(pyros != null);
+		if (pyros != null && pyro_ui != null)
+			pyro_ui.set_pyros(pyros);
+	}
+
+	public AltosPyro[] pyros() {
+		if (pyro_ui != null)
+			pyros = pyro_ui.get_pyros();
+		return pyros;
 	}
 }