X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosFlashUI.java;h=5ed417da993a0d149146ff78d039ccb2a5f703c1;hp=5cae475641129315daea9d54e881cfb4ff36e282;hb=af200f5b84555de0556b52146379f3934774a3f3;hpb=ebeb13688a9a5442c838641ede6ba0dc92c9a1a4

diff --git a/ao-tools/altosui/AltosFlashUI.java b/ao-tools/altosui/AltosFlashUI.java
index 5cae4756..5ed417da 100644
--- a/ao-tools/altosui/AltosFlashUI.java
+++ b/ao-tools/altosui/AltosFlashUI.java
@@ -31,46 +31,163 @@ import java.util.concurrent.LinkedBlockingQueue;
 import altosui.AltosHexfile;
 import altosui.AltosFlash;
 
-public class AltosFlashUI implements Runnable {
+public class AltosFlashUI
+	extends JDialog
+	implements Runnable, ActionListener
+{
+	Container	pane;
+	Box		box;
+	JLabel		serial_label;
+	JLabel		serial_value;
+	JLabel		file_label;
+	JLabel		file_value;
+	JProgressBar	pbar;
+	JButton		cancel;
+
 	File		file;
 	Thread		thread;
 	JFrame		frame;
 	AltosDevice	debug_dongle;
 	AltosFlash	flash;
 
+	public void actionPerformed(ActionEvent e) {
+		if (e.getSource() == cancel) {
+			abort();
+			dispose();
+		} else {
+			String	cmd = e.getActionCommand();
+			if (cmd.equals("done"))
+				;
+			else if (cmd.equals("start")) {
+				setVisible(true);
+			} else {
+				pbar.setValue(e.getID());
+				pbar.setString(cmd);
+			}
+		}
+	}
+
 	public void run() {
 		flash = new AltosFlash(file, debug_dongle);
+		flash.addActionListener(this);
 		try {
 			flash.open();
-			if (!flash.check_rom_config()) {
-				AltosRomconfigUI romconfig_ui = new AltosRomconfigUI (frame);
-				romconfig_ui.showDialog();
-				AltosRomconfig romconfig = romconfig_ui.romconfig();
-				if (romconfig == null)
-					return;
+			AltosRomconfigUI romconfig_ui = new AltosRomconfigUI (frame);
+
+			romconfig_ui.set(flash.romconfig());
+			AltosRomconfig romconfig = romconfig_ui.showDialog();
+
+			if (romconfig != null && romconfig.valid()) {
 				flash.set_romconfig(romconfig);
+				serial_value.setText(String.format("%d",
+								   flash.romconfig().serial_number));
+				file_value.setText(file.toString());
+				setVisible(true);
+				flash.flash();
+				flash = null;
 			}
-			flash.flash();
 		} catch (FileNotFoundException ee) {
 			JOptionPane.showMessageDialog(frame,
 						      "Cannot open image",
 						      file.toString(),
 						      JOptionPane.ERROR_MESSAGE);
-			return;
 		} catch (IOException e) {
 			JOptionPane.showMessageDialog(frame,
 						      e.getMessage(),
 						      file.toString(),
 						      JOptionPane.ERROR_MESSAGE);
-			return;
 		} catch (InterruptedException ie) {
+		} finally {
+			abort();
 		}
+		dispose();
+	}
+
+	public void abort() {
+		if (flash != null)
+			flash.abort();
+	}
+
+	public void build_dialog() {
+		GridBagConstraints c;
+		Insets il = new Insets(4,4,4,4);
+		Insets ir = new Insets(4,4,4,4);
+
+		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:");
+		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;
+		file_label = new JLabel("File:");
+		pane.add(file_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;
+		file_value = new JLabel("");
+		pane.add(file_value, c);
+
+		pbar = new JProgressBar();
+		pbar.setMinimum(0);
+		pbar.setMaximum(100);
+		pbar.setValue(0);
+		pbar.setString("");
+		pbar.setStringPainted(true);
+		pbar.setPreferredSize(new Dimension(600, 20));
+		c = new GridBagConstraints();
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.anchor = GridBagConstraints.CENTER;
+		c.gridx = 0; c.gridy = 2;
+		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 = 3;
+		c.gridwidth = GridBagConstraints.REMAINDER;
+		Insets ic = new Insets(4,4,4,4);
+		c.insets = ic;
+		pane.add(cancel, c);
+		cancel.addActionListener(this);
+		pack();
+		setLocationRelativeTo(frame);
 	}
 
 	public AltosFlashUI(JFrame in_frame) {
+		super(in_frame, "Program Altusmetrum Device", false);
+
 		frame = in_frame;
 
-		debug_dongle = AltosDeviceDialog.show(frame, AltosDevice.Any);
+		build_dialog();
+
+		debug_dongle = AltosDeviceDialog.show(frame, AltosDevice.product_any);
 
 		if (debug_dongle == null)
 			return;