X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosEepromMonitor.java;h=7ff00eadb0c371051ae48050ca154c3bf39f824e;hb=a08b2a6363c194195db92029743f6612676373ce;hp=a7b1dd3ed11cacb35e64d25c309d28704b931e2e;hpb=ce90f3fe2aa6e23695ccccb36a8e6e614a08ba31;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosEepromMonitor.java b/ao-tools/altosui/AltosEepromMonitor.java
index a7b1dd3e..7ff00ead 100644
--- a/ao-tools/altosui/AltosEepromMonitor.java
+++ b/ao-tools/altosui/AltosEepromMonitor.java
@@ -28,36 +28,80 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import altosui.AltosSerial;
-import altosui.AltosSerialMonitor;
-import altosui.AltosTelemetry;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-
 public class AltosEepromMonitor extends JDialog {
 
-	JPanel		panel;
+	Container	pane;
 	Box		box;
 	JLabel		serial_label;
 	JLabel		flight_label;
 	JLabel		file_label;
+	JLabel		serial_value;
+	JLabel		flight_value;
+	JLabel		file_value;
+	JButton		cancel;
 	JProgressBar	pbar;
 	int		min_state, max_state;
 
 	public AltosEepromMonitor(JFrame owner, int in_min_state, int in_max_state) {
-		super (owner, "Download Flight Data");
+		super (owner, "Download Flight Data", false);
+
+		GridBagConstraints c;
+		Insets il = new Insets(4,4,4,4);
+		Insets ir = new Insets(4,4,4,4);
 
-		box = Box.createVerticalBox();
+		pane = getContentPane();
+		pane.setLayout(new GridBagLayout());
 
+		c = new GridBagConstraints();
+		c.gridx = 0; c.gridy = 0;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = il;
 		serial_label = new JLabel("Serial:");
-		box.add(serial_label);
+		pane.add(serial_label, c);
+
+		c = new GridBagConstraints();
+		c.gridx = 1; c.gridy = 0;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = ir;
+		serial_value = new JLabel("");
+		pane.add(serial_value, c);
+
+		c = new GridBagConstraints();
+		c.fill = GridBagConstraints.NONE;
+		c.gridx = 0; c.gridy = 1;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = il;
 		flight_label = new JLabel("Flight:");
-		box.add(flight_label);
+		pane.add(flight_label, c);
+
+		c = new GridBagConstraints();
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		c.gridx = 1; c.gridy = 1;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = ir;
+		flight_value = new JLabel("");
+		pane.add(flight_value, c);
+
+		c = new GridBagConstraints();
+		c.fill = GridBagConstraints.NONE;
+		c.gridx = 0; c.gridy = 2;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = il;
 		file_label = new JLabel("File:");
-		box.add(file_label);
+		pane.add(file_label, c);
+
+		c = new GridBagConstraints();
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		c.gridx = 1; c.gridy = 2;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = ir;
+		file_value = new JLabel("");
+		pane.add(file_value, c);
 
 		min_state = in_min_state;
 		max_state = in_max_state;
@@ -67,19 +111,36 @@ public class AltosEepromMonitor extends JDialog {
 		pbar.setValue(0);
 		pbar.setString("startup");
 		pbar.setStringPainted(true);
-		box.add(pbar);
-
-		panel = new JPanel();
-		panel.add(box);
+		pbar.setPreferredSize(new Dimension(600, 20));
+		c = new GridBagConstraints();
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.anchor = GridBagConstraints.CENTER;
+		c.gridx = 0; c.gridy = 3;
+		c.gridwidth = GridBagConstraints.REMAINDER;
+		Insets ib = new Insets(4,4,4,4);
+		c.insets = ib;
+		pane.add(pbar, c);
+
+
+		cancel = new JButton("Cancel");
+		c = new GridBagConstraints();
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.CENTER;
+		c.gridx = 0; c.gridy = 4;
+		c.gridwidth = GridBagConstraints.REMAINDER;
+		Insets ic = new Insets(4,4,4,4);
+		c.insets = ic;
+		pane.add(cancel, c);
 
-		add(panel);
-
-		setMinimumSize(new Dimension(600, 0));
-		setContentPane(panel);
 		pack();
+		setLocationRelativeTo(owner);
 		setVisible(true);
 	}
 
+	public void addActionListener (ActionListener l) {
+		cancel.addActionListener(l);
+	}
+
 	public void set_value(String state_name, int in_state, int in_block) {
 		int block = in_block;
 		int state = in_state;
@@ -92,23 +153,20 @@ public class AltosEepromMonitor extends JDialog {
 
 		int pos = state * 100 + block;
 
-		System.out.printf ("State %s (%d + %d) = %d\n",
-				   state_name, in_state, in_block, pos);
-
 		pbar.setString(state_name);
 		pbar.setValue(pos);
 	}
 
 	public void set_serial(int serial) {
-		serial_label.setText(String.format("Serial: %d", serial));
+		serial_value.setText(String.format("%d", serial));
 	}
 
 	public void set_flight(int flight) {
-		flight_label.setText(String.format("Flight: %d", flight));
+		flight_value.setText(String.format("%d", flight));
 	}
 
 	public void set_file(String file) {
-		file_label.setText(String.format("File: %s", file));
+		file_value.setText(String.format("%s", file));
 	}
 
 	public void done() {