X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=fefe74e82e4b2c397780134c8fcf7795a19d5442;hb=a680ce61bdcffeacb7f0e4dcef71a03cb7cfe07d;hp=6a24d8a996899f915d98d8f9587834d0a892d5a3;hpb=8c20030ea4eb8e068e1ba88e01d07dfbc27bd7db;p=fw%2Faltos

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 6a24d8a9..fefe74e8 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -26,7 +26,7 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.*;
 
 import libaltosJNI.*;
 
@@ -67,6 +67,16 @@ public class AltosUI extends JFrame {
 						      device.toShortString(),
 						      "Unkonwn I/O error",
 						      JOptionPane.ERROR_MESSAGE);
+		} catch (TimeoutException te) {
+			JOptionPane.showMessageDialog(this,
+						      device.toShortString(),
+						      "Timeout error",
+						      JOptionPane.ERROR_MESSAGE);
+		} catch (InterruptedException ie) {
+			JOptionPane.showMessageDialog(this,
+						      device.toShortString(),
+						      "Interrupted exception",
+						      JOptionPane.ERROR_MESSAGE);
 		}
 	}
 
@@ -137,7 +147,7 @@ public class AltosUI extends JFrame {
 						ExportData();
 					}
 				});
-		b = addButton(0, 1, "Configure TeleMetrum");
+		b = addButton(0, 1, "Configure Altimeter");
 		b.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
 						ConfigureTeleMetrum();
@@ -180,6 +190,20 @@ public class AltosUI extends JFrame {
 				}
 			});
 
+		b = addButton(1, 2, "Load Maps");
+		b.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					LoadMaps();
+				}
+			});
+
+		b = addButton(2, 2, "Monitor Idle");
+		b.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					IdleMonitor();
+				}
+			});
+
 		setTitle("AltOS");
 
 		pane.doLayout();
@@ -238,6 +262,10 @@ public class AltosUI extends JFrame {
 		new AltosScanUI(AltosUI.this);
 	}
 
+	void LoadMaps() {
+		new AltosSiteMapPreload(AltosUI.this);
+	}
+
 	/*
 	 * Replay a flight from telemetry data
 	 */
@@ -289,6 +317,13 @@ public class AltosUI extends JFrame {
 		new AltosConfigureUI(AltosUI.this, voice);
 	}
 
+	private void IdleMonitor() {
+		try {
+			new AltosIdleMonitorUI(this);
+		} catch (Exception e) {
+		}
+	}
+
 	static AltosRecordIterable open_logfile(String filename) {
 		File file = new File (filename);
 		try {