X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2FTeleGPS.java;h=eddb47d8f2975fc496bd1817aa14c63025a210f5;hb=ae7084f5199318dc6582e212492a50cfda1cebb8;hp=c61b245e006c80d7e16ae353df4cd093ccc19a63;hpb=ae1174317fc476e39077f7dc257ec08709c6b301;p=fw%2Faltos

diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index c61b245e..eddb47d8 100644
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -67,50 +67,51 @@ public class TeleGPS
 
 	JTabbedPane		pane;
 
-	AltosSiteMap   		sitemap;
+	AltosUIMap   		map;
 	TeleGPSInfo		gps_info;
+	TeleGPSState		gps_state;
 	AltosInfoTable		info_table;
 
 	LinkedList<AltosFlightDisplay>	displays;
 
 	/* File menu */
 	final static String	new_command = "new";
-	final static String	preferences_command = "preferences";
+	final static String	graph_command = "graph";
+	final static String	export_command = "export";
 	final static String	load_maps_command = "loadmaps";
+	final static String	preferences_command = "preferences";
 	final static String	close_command = "close";
 	final static String	exit_command = "exit";
 
 	static final String[][] file_menu_entries = new String[][] {
 		{ "New Window",		new_command },
-		{ "Preferences",	preferences_command },
+		{ "Graph Data",		graph_command },
+		{ "Export Data",	export_command },
 		{ "Load Maps",		load_maps_command },
+		{ "Preferences",	preferences_command },
 		{ "Close",		close_command },
 		{ "Exit",		exit_command },
 	};
 
 	/* Monitor menu */
-	final static String	monitor_command = "monitor";
+	final static String	connect_command = "connect";
 	final static String	disconnect_command = "disconnect";
 	final static String	scan_command = "scan";
 
 	static final String[][] monitor_menu_entries = new String[][] {
-		{ "Monitor Device",	monitor_command },
+		{ "Connect Device",	connect_command },
 		{ "Disconnect",		disconnect_command },
 		{ "Scan Channels",	scan_command },
 	};
 
 	/* Device menu */
 	final static String	download_command = "download";
-	final static String	export_command = "export";
-	final static String	graph_command = "graph";
 	final static String	configure_command = "configure";
 	final static String	flash_command = "flash";
 
 	static final String[][] device_menu_entries = new String[][] {
 		{ "Download Data",	download_command },
 		{ "Configure Device",	configure_command },
-		{ "Export Data",	export_command },
-		{ "Graph Data",		graph_command },
 		{ "Flash Device",	flash_command },
 	};
 
@@ -167,7 +168,7 @@ public class TeleGPS
 	}
 
 	void load_maps() {
-		new AltosSiteMapPreload(this);
+		new AltosUIMapPreload(this);
 	}
 
 	void disconnect() {
@@ -212,7 +213,7 @@ public class TeleGPS
 		}
 	}
 
-	void monitor() {
+	void connect() {
 		AltosDevice	device = AltosDeviceUIDialog.show(this,
 								  AltosLib.product_basestation);
 		if (device == null)
@@ -285,8 +286,8 @@ public class TeleGPS
 			System.exit(0);
 
 		/* Monitor menu */
-		if (monitor_command.equals(ev.getActionCommand())) {
-			monitor();
+		if (connect_command.equals(ev.getActionCommand())) {
+			connect();
 			return;
 		}
 		if (disconnect_command.equals(ev.getActionCommand())) {
@@ -323,6 +324,9 @@ public class TeleGPS
 
 	void add_frequency_menu(int serial, final AltosFlightReader reader) {
 		// Channel menu
+		if (frequencies != null)
+			return;
+
 		frequencies = new AltosFreqList(AltosUIPreferences.frequency(serial));
 		frequencies.set_product("Monitor");
 		frequencies.set_serial(serial);
@@ -343,6 +347,7 @@ public class TeleGPS
 	void remove_frequency_menu() {
 		if (frequencies != null) {
 			menu_bar.remove(frequencies);
+			menu_bar.repaint();
 			frequencies = null;
 		}
 	}
@@ -366,6 +371,7 @@ public class TeleGPS
 	}
 
 	private void close() {
+		disconnect();
 		AltosUIPreferences.unregister_font_listener(this);
 		AltosPreferences.unregister_units_listener(this);
 		setVisible(false);
@@ -438,14 +444,18 @@ public class TeleGPS
 		c.gridwidth = 2;
 		bag.add(pane, c);
 
-		sitemap = new AltosSiteMap();
-		pane.add("Site Map", sitemap);
-		displays.add(sitemap);
+		map = new AltosUIMap();
+		pane.add(map.getName(), map);
+		displays.add(map);
 
 		gps_info = new TeleGPSInfo();
-		pane.add("Info", gps_info);
+		pane.add(gps_info.getName(), gps_info);
 		displays.add(gps_info);
 
+		gps_state = new TeleGPSState();
+		pane.add(gps_state.getName(), gps_state);
+		displays.add(gps_state);
+
 		info_table = new AltosInfoTable();
 		pane.add("Table", info_table);
 		displays.add(info_table);
@@ -578,7 +588,7 @@ public class TeleGPS
 				} else {
 					double lat = Double.parseDouble(args[i+1]);
 					double lon = Double.parseDouble(args[i+2]);
-					AltosSiteMap.prefetchMaps(lat, lon);
+					AltosUIMap.prefetch_maps(lat, lon);
 					i += 2;
 				}
 			} else if (args[i].equals("--replay"))