X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosIdleMonitorUI.java;h=88243c5d396150eb744758305053dae89f752c1c;hp=1ef30f0a29a17dcd7db0a7e70932b9d305ca989b;hb=2c4ebe9b4b392531cd1a5bbafc4ddc38a9391af5;hpb=398c02b945a58634c8932f07df2c2be8438da7d1

diff --git a/altosui/AltosIdleMonitorUI.java b/altosui/AltosIdleMonitorUI.java
index 1ef30f0a..88243c5d 100644
--- a/altosui/AltosIdleMonitorUI.java
+++ b/altosui/AltosIdleMonitorUI.java
@@ -23,22 +23,30 @@ import javax.swing.*;
 import javax.swing.event.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_1.*;
-import org.altusmetrum.altosuilib_1.*;
+import java.util.Arrays;
+import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altosuilib_6.*;
 
-public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosFontListener, AltosIdleMonitorListener, DocumentListener {
+public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDisplay, AltosIdleMonitorListener, DocumentListener {
 	AltosDevice		device;
 	JTabbedPane		pane;
 	AltosPad		pad;
 	AltosInfoTable		flightInfo;
 	AltosFlightStatus	flightStatus;
+	AltosIgnitor		ignitor;
 	AltosIdleMonitor	thread;
+	AltosUIMap      	sitemap;
 	int			serial;
 	boolean			remote;
+	boolean			has_ignitor;
+	boolean			has_map;
 
 	void stop_display() {
 		if (thread != null) {
-			thread.abort();
+			try {
+				thread.abort();
+			} catch (InterruptedException ie) {
+			}
 		}
 		thread = null;
 	}
@@ -52,39 +60,76 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		flightInfo.clear();
 	}
 
-	public void set_font() {
-		pad.set_font();
-		flightInfo.set_font();
+	public void font_size_changed(int font_size) {
+		pad.font_size_changed(font_size);
+		flightInfo.font_size_changed(font_size);
 	}
 
-	public void font_size_changed(int font_size) {
-		set_font();
+	public void units_changed(boolean imperial_units) {
+		pad.units_changed(imperial_units);
+		flightInfo.units_changed(imperial_units);
 	}
 
 	AltosFlightStatusUpdate	status_update;
 
 	public void show(AltosState state, AltosListenerState listener_state) {
 		status_update.saved_state = state;
-		try {
+		if (ignitor.should_show(state)) {
+			if (!has_ignitor) {
+				pane.add("Ignitor", ignitor);
+				has_ignitor = true;
+			}
+		} else {
+			if (has_ignitor) {
+				pane.remove(ignitor);
+				has_ignitor = false;
+			}
+		}
+		if (state.gps != null && state.gps.connected) {
+			if (!has_map) {
+				pane.add("Site Map", sitemap);
+				has_map = true;
+			}
+		} else {
+			if (has_map) {
+				pane.remove(sitemap);
+				has_map = false;
+			}
+		}
+
+//		try {
 			pad.show(state, listener_state);
 			flightStatus.show(state, listener_state);
 			flightInfo.show(state, listener_state);
-		} catch (Exception e) {
-			System.out.print("Show exception" + e);
-		}
+			if (has_ignitor)
+				ignitor.show(state, listener_state);
+			if (has_map)
+				sitemap.show(state, listener_state);
+//		} catch (Exception e) {
+//			System.out.print("Show exception " + e);
+//		}
+	}
+
+	public void update(final AltosState state, final AltosListenerState listener_state) {
+		Runnable r = new Runnable() {
+				public void run() {
+					show(state, listener_state);
+				}
+			};
+		SwingUtilities.invokeLater(r);
 	}
 
-	public void update(final AltosState state) {
+	public void failed() {
 		Runnable r = new Runnable() {
 				public void run() {
-					show(state, null);
+					close();
 				}
 			};
 		SwingUtilities.invokeLater(r);
 	}
 
 	Container	bag;
-	AltosFreqList	frequencies;
+	AltosUIFreqList	frequencies;
 	JTextField	callsign_value;
 
 	/* DocumentListener interface methods */
@@ -128,8 +173,48 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		return constraints(x, width, GridBagConstraints.NONE);
 	}
 
+	void idle_exception(JFrame owner, Exception e) {
+		if (e instanceof FileNotFoundException) {
+			JOptionPane.showMessageDialog(owner,
+						      ((FileNotFoundException) e).getMessage(),
+						      "Cannot open target device",
+						      JOptionPane.ERROR_MESSAGE);
+		} else if (e instanceof AltosSerialInUseException) {
+			JOptionPane.showMessageDialog(owner,
+						      String.format("Device \"%s\" already in use",
+								    device.toShortString()),
+						      "Device in use",
+						      JOptionPane.ERROR_MESSAGE);
+		} else if (e instanceof IOException) {
+			IOException ee = (IOException) e;
+			JOptionPane.showMessageDialog(owner,
+						      device.toShortString(),
+						      ee.getLocalizedMessage(),
+						      JOptionPane.ERROR_MESSAGE);
+		} else {
+			JOptionPane.showMessageDialog(owner,
+						      String.format("Connection to \"%s\" failed",
+								    device.toShortString()),
+						      "Connection Failed",
+						      JOptionPane.ERROR_MESSAGE);
+		}
+	}
+
+	private void close() {
+		try {
+			disconnect();
+		} catch (Exception ex) {
+			System.out.printf("Exception %s\n", ex.toString());
+			for (StackTraceElement el : ex.getStackTrace())
+				System.out.printf("%s\n", el.toString());
+		}
+		setVisible(false);
+		dispose();
+		AltosUIPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
+	}
+
 	public AltosIdleMonitorUI(JFrame in_owner)
-		throws FileNotFoundException, AltosSerialInUseException, TimeoutException, InterruptedException {
+		throws FileNotFoundException, TimeoutException, InterruptedException {
 
 		device = AltosDeviceUIDialog.show(in_owner, Altos.product_any);
 		remote = false;
@@ -137,6 +222,16 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 			remote = true;
 
 		serial = device.getSerial();
+
+		AltosSerial link;
+		try {
+			link = new AltosSerial(device);
+			link.set_frame(this);
+		} catch (Exception ex) {
+			idle_exception(in_owner, ex);
+			return;
+		}
+
 		bag = getContentPane();
 		bag.setLayout(new GridBagLayout());
 
@@ -145,7 +240,7 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		/* Stick frequency selector at top of table for telemetry monitoring */
 		if (remote && serial >= 0) {
 			// Frequency menu
-			frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
+			frequencies = new AltosUIFreqList(AltosUIPreferences.frequency(serial));
 			frequencies.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						double frequency = frequencies.frequency();
@@ -181,6 +276,10 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		flightInfo = new AltosInfoTable();
 		pane.add("Table", new JScrollPane(flightInfo));
 
+		ignitor = new AltosIgnitor();
+
+		sitemap = new AltosUIMap();
+
 		/* Make the tabbed pane use the rest of the window space */
 		bag.add(pane, constraints(0, 3, GridBagConstraints.BOTH));
 
@@ -191,17 +290,14 @@ public class AltosIdleMonitorUI extends AltosUIFrame implements AltosFlightDispl
 		addWindowListener(new WindowAdapter() {
 				@Override
 				public void windowClosing(WindowEvent e) {
-					disconnect();
-					setVisible(false);
-					dispose();
-					AltosUIPreferences.unregister_font_listener(AltosIdleMonitorUI.this);
+					close();
 				}
 			});
 
 		pack();
 		setVisible(true);
 
-		thread = new AltosIdleMonitor((AltosIdleMonitorListener) this, (AltosLink) new AltosSerial (device), (boolean) remote);
+		thread = new AltosIdleMonitor((AltosIdleMonitorListener) this, link, (boolean) remote);
 
 		status_update = new AltosFlightStatusUpdate(flightStatus);