X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosConfigPyroUI.java;h=61208dfe91676a81acfdc1b0f317d9e48d53a6a6;hp=7a298a3ca679a6f26df6abc46816d4efcb3b00c6;hb=0e929ee2d0a3d1b1bacd36c2c3723ab860eb40b6;hpb=ace5f42b5567cff07a61b622171ac364ea8c165d

diff --git a/altosui/AltosConfigPyroUI.java b/altosui/AltosConfigPyroUI.java
index 7a298a3c..61208dfe 100644
--- a/altosui/AltosConfigPyroUI.java
+++ b/altosui/AltosConfigPyroUI.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altosuilib_6.*;
 
 public class AltosConfigPyroUI
 	extends AltosUIDialog
@@ -278,24 +278,55 @@ public class AltosConfigPyroUI
 		return pyros;
 	}
 
+	JLabel			pyro_firing_time_label;
+	JComboBox<String>	pyro_firing_time_value;
+
+	static String[]		pyro_firing_time_values = {
+		"0.050", "0.100", "0.250", "0.500", "1.0", "2.0"
+	};
+
+	boolean	initializing;
+
+	public void set_pyro_firing_time(double new_pyro_firing_time) {
+		initializing = true;
+		pyro_firing_time_value.setSelectedItem(Double.toString(new_pyro_firing_time));
+		pyro_firing_time_value.setEnabled(new_pyro_firing_time >= 0);
+		initializing = false;
+	}
+
+	public double get_pyro_firing_time() throws AltosConfigDataException {
+		String	v = pyro_firing_time_value.getSelectedItem().toString();
+
+		try {
+			return Double.parseDouble(v);
+		} catch (NumberFormatException e) {
+			throw new AltosConfigDataException("Invalid pyro firing time \"%s\"", v);
+		}
+	}
+
 	public void set_dirty() {
-		owner.set_dirty();
+		if (!initializing)
+			owner.set_dirty();
 	}
 
 	public void itemStateChanged(ItemEvent e) {
-		owner.set_dirty();
+		if (!initializing)
+			owner.set_dirty();
 	}
 
 	public void changedUpdate(DocumentEvent e) {
-		owner.set_dirty();
+		if (!initializing)
+			owner.set_dirty();
 	}
 
 	public void insertUpdate(DocumentEvent e) {
-		owner.set_dirty();
+		if (!initializing)
+			owner.set_dirty();
 	}
 
 	public void removeUpdate(DocumentEvent e) {
-		owner.set_dirty();
+		if (!initializing)
+			owner.set_dirty();
 	}
 
 	public void units_changed(boolean imperial_units) {
@@ -334,7 +365,7 @@ public class AltosConfigPyroUI
 			setVisible(false);
 	}
 
-	public AltosConfigPyroUI(AltosConfigUI in_owner, AltosPyro[] pyros) {
+	public AltosConfigPyroUI(AltosConfigUI in_owner, AltosPyro[] pyros, double pyro_firing_time) {
 
 		super(in_owner, "Configure Pyro Channels", false);
 
@@ -379,6 +410,32 @@ public class AltosConfigPyroUI
 			columns[i].set(pyros[i]);
 		}
 
+		/* Pyro firing time */
+		c = new GridBagConstraints();
+		c.gridx = 0; c.gridy = row;
+		c.gridwidth = 2;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = il;
+		c.ipady = 5;
+		pyro_firing_time_label = new JLabel("Pyro Firing Time(s):");
+		pane.add(pyro_firing_time_label, c);
+
+		c = new GridBagConstraints();
+		c.gridx = 2; c.gridy = row;
+		c.gridwidth = 7;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = ir;
+		c.ipady = 5;
+		pyro_firing_time_value = new JComboBox<String>(pyro_firing_time_values);
+		pyro_firing_time_value.setEditable(true);
+		pyro_firing_time_value.addItemListener(this);
+		set_pyro_firing_time(pyro_firing_time);
+		pane.add(pyro_firing_time_value, c);
+		pyro_firing_time_value.setToolTipText("Length of extra pyro channel firing pulse");
+
 		c = new GridBagConstraints();
 		c.gridx = pyros.length*2-1;
 		c.fill = GridBagConstraints.HORIZONTAL;