X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosConfigPyroUI.java;h=7a298a3ca679a6f26df6abc46816d4efcb3b00c6;hb=ff13cf1359e1f4ae33b16a5867fd364993566b65;hp=81d121119acce8c580343078132213a95f9a9bd5;hpb=82b42935d047d2f7c2f7a63a3efb72a3f1d5594e;p=fw%2Faltos

diff --git a/altosui/AltosConfigPyroUI.java b/altosui/AltosConfigPyroUI.java
index 81d12111..7a298a3c 100644
--- a/altosui/AltosConfigPyroUI.java
+++ b/altosui/AltosConfigPyroUI.java
@@ -21,12 +21,12 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_2.*;
-import org.altusmetrum.altosuilib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosConfigPyroUI
 	extends AltosUIDialog
-	implements ItemListener, DocumentListener, AltosUnitsListener
+	implements ItemListener, DocumentListener, AltosUnitsListener, ActionListener
 {
 	AltosConfigUI	owner;
 	Container	pane;
@@ -48,9 +48,9 @@ public class AltosConfigPyroUI
 	class PyroItem implements ItemListener, DocumentListener, AltosUnitsListener
 	{
 		public int		flag;
-		public JRadioButton	enable;
+		public JCheckBox	enable;
 		public JTextField	value;
-		public JComboBox	combo;
+		public JComboBox<String>	combo;
 		AltosConfigPyroUI	ui;
 		boolean			setting;
 
@@ -63,22 +63,22 @@ public class AltosConfigPyroUI
 
 		public void itemStateChanged(ItemEvent e) {
 			set_enable(enable.isSelected());
-			if (!setting) 
+			if (!setting)
 				ui.set_dirty();
 		}
 
 		public void changedUpdate(DocumentEvent e) {
-			if (!setting) 
+			if (!setting)
 				ui.set_dirty();
 		}
 
 		public void insertUpdate(DocumentEvent e) {
-			if (!setting) 
+			if (!setting)
 				ui.set_dirty();
 		}
 
 		public void removeUpdate(DocumentEvent e) {
-			if (!setting) 
+			if (!setting)
 				ui.set_dirty();
 		}
 
@@ -105,11 +105,13 @@ public class AltosConfigPyroUI
 				AltosUnits units = AltosPyro.pyro_to_units(flag);
 				if (units != null)
 					unit_value = units.value(new_value);
-				String	format = "%6.0f";
-				if (scale >= 10)
-					format = "%6.1f";
-				else if (scale >= 100)
+				String	format;
+				if (scale >= 100)
 					format = "%6.2f";
+				else if (scale >= 10)
+					format = "%6.1f";
+				else
+					format = "%6.0f";
 				value.setText(String.format(format, unit_value));
 			}
 			if (combo != null)
@@ -122,12 +124,16 @@ public class AltosConfigPyroUI
 			return enable.isSelected();
 		}
 
-		public double value() {
+		public double value() throws AltosConfigDataException {
 			if (value != null) {
 				AltosUnits units = AltosPyro.pyro_to_units(flag);
-				if (units != null)
-					return units.parse(value.getText());
-				return Double.parseDouble(value.getText());
+				try {
+					if (units != null)
+						return units.parse(value.getText());
+					return Double.parseDouble(value.getText());
+				} catch (NumberFormatException e) {
+					throw new AltosConfigDataException("\"%s\": %s\n", value.getText(), e.getMessage());
+				}
 			}
 			if (combo != null)
 				return combo.getSelectedIndex() + AltosLib.ao_flight_boost;
@@ -146,10 +152,10 @@ public class AltosConfigPyroUI
 			c.fill = GridBagConstraints.NONE;
 			c.anchor = GridBagConstraints.LINE_START;
 			c.insets = il;
-			enable = new JRadioButton();
+			enable = new JCheckBox();
 			enable.addItemListener(this);
 			pane.add(enable, c);
-			
+
 			if ((flag & AltosPyro.pyro_no_value) == 0) {
 				c = new GridBagConstraints();
 				c.gridx = x+1; c.gridy = y;
@@ -159,7 +165,7 @@ public class AltosConfigPyroUI
 				c.insets = il;
 				if ((flag & AltosPyro.pyro_state_value) != 0) {
 					make_state_names();
-					combo = new JComboBox(state_names);
+					combo = new JComboBox<String>(state_names);
 					combo.addItemListener(this);
 					pane.add(combo, c);
 				} else {
@@ -187,15 +193,21 @@ public class AltosConfigPyroUI
 			}
 		}
 
-		public AltosPyro get() {
+		public AltosPyro get() throws AltosConfigDataException {
 			AltosPyro	p = new AltosPyro(channel);
 
 			int row = 0;
 			for (int flag = 1; flag < AltosPyro.pyro_all; flag <<= 1) {
 				if ((AltosPyro.pyro_all & flag) != 0) {
 					if (items[row].enabled()) {
+						try {
 						p.flags |= flag;
 						p.set_value(flag, items[row].value());
+						} catch (AltosConfigDataException ae) {
+							throw new AltosConfigDataException("%s, %s",
+											   AltosPyro.pyro_to_name(flag),
+											   ae.getMessage());
+						}
 					}
 					row++;
 				}
@@ -224,7 +236,7 @@ public class AltosConfigPyroUI
 
 			items = new PyroItem[nrow];
 			int row = 0;
-			
+
 			GridBagConstraints	c;
 			c = new GridBagConstraints();
 			c.gridx = x; c.gridy = y;
@@ -232,7 +244,7 @@ public class AltosConfigPyroUI
 			c.fill = GridBagConstraints.NONE;
 			c.anchor = GridBagConstraints.CENTER;
 			c.insets = il;
-			label = new JLabel(String.format("Pyro Channel %d", channel));
+			label = new JLabel(String.format("Pyro Channel %c", 'A' + channel));
 			pane.add(label, c);
 			y++;
 
@@ -254,10 +266,15 @@ public class AltosConfigPyroUI
 		}
 	}
 
-	public AltosPyro[] get_pyros() {
+	public AltosPyro[] get_pyros() throws AltosConfigDataException {
 		AltosPyro[]	pyros = new AltosPyro[columns.length];
-		for (int c = 0; c < columns.length; c++)
-			pyros[c] = columns[c].get();
+		for (int c = 0; c < columns.length; c++) {
+			try {
+				pyros[c] = columns[c].get();
+			} catch (AltosConfigDataException ae) {
+				throw new AltosConfigDataException ("Channel %c, %s", c + 'A', ae.getMessage());
+			}
+		}
 		return pyros;
 	}
 
@@ -309,6 +326,14 @@ public class AltosConfigPyroUI
 		}
 	}
 
+	/* Listen for events from our buttons */
+	public void actionPerformed(ActionEvent e) {
+		String	cmd = e.getActionCommand();
+
+		if (cmd.equals("Close"))
+			setVisible(false);
+	}
+
 	public AltosConfigPyroUI(AltosConfigUI in_owner, AltosPyro[] pyros) {
 
 		super(in_owner, "Configure Pyro Channels", false);
@@ -353,6 +378,17 @@ public class AltosConfigPyroUI
 			columns[i] = new PyroColumn(this, i*2 + 1, 0, i);
 			columns[i].set(pyros[i]);
 		}
+
+		c = new GridBagConstraints();
+		c.gridx = pyros.length*2-1;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.gridwidth = 2;
+		c.gridy = 1000;
+		JButton close = new JButton("Close");
+		pane.add(close, c);
+		close.addActionListener(this);
+		close.setActionCommand("Close");
+
 		addWindowListener(new ConfigListener(this, owner));
 		AltosPreferences.register_units_listener(this);
 	}