X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=telegps%2FTeleGPS.java;h=1898a668057b363751bb448b74433598407134aa;hp=bef0bbc69d5ab04c36c3653a943037a75090cd3e;hb=8cb41ce9a64029b611b3595c86a4a8e74b952ff4;hpb=f80075be4ebb9c5fe00c24b8c7638fad23267424

diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index bef0bbc6..1898a668 100644
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -51,7 +51,7 @@ public class TeleGPS
 	}
 
 	AltosFlightReader	reader;
-	AltosDisplayThread	thread;
+	TeleGPSDisplayThread	thread;
 
 	JMenuBar		menu_bar;
 
@@ -67,7 +67,7 @@ public class TeleGPS
 
 	JTabbedPane		pane;
 
-	AltosSiteMap   		sitemap;
+	AltosUIMap   		map;
 	TeleGPSInfo		gps_info;
 	AltosInfoTable		info_table;
 
@@ -167,7 +167,7 @@ public class TeleGPS
 	}
 
 	void load_maps() {
-		new AltosSiteMapPreload(this);
+		new AltosUIMapPreload(this);
 	}
 
 	void disconnect() {
@@ -246,6 +246,16 @@ public class TeleGPS
 	}
 
 	void graph() {
+		AltosDataChooser chooser;
+		chooser = new AltosDataChooser(this);
+		AltosStateIterable states = chooser.runDialog();
+		if (states == null)
+			return;
+		try {
+			new TeleGPSGraphUI(states, chooser.file());
+		} catch (InterruptedException ie) {
+		} catch (IOException ie) {
+		}
 	}
 
 	void flash() {
@@ -313,6 +323,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);
@@ -333,26 +346,36 @@ public class TeleGPS
 	void remove_frequency_menu() {
 		if (frequencies != null) {
 			menu_bar.remove(frequencies);
+			menu_bar.repaint();
 			frequencies = null;
 		}
 	}
 
 	public void set_reader(AltosFlightReader reader) {
 		setTitle(String.format("TeleGPS %s", reader.name));
-		thread = new AltosDisplayThread(this, voice(), this, reader);
+		thread = new TeleGPSDisplayThread(this, voice(), this, reader);
 		thread.start();
 	}
 
 	static int	number_of_windows;
 
+	static public void add_window() {
+		++number_of_windows;
+	}
+
+	static public void subtract_window() {
+		--number_of_windows;
+		if (number_of_windows == 0)
+			System.exit(0);
+	}
+
 	private void close() {
+		disconnect();
 		AltosUIPreferences.unregister_font_listener(this);
 		AltosPreferences.unregister_units_listener(this);
 		setVisible(false);
 		dispose();
-		--number_of_windows;
-		if (number_of_windows == 0)
-			System.exit(0);
+		subtract_window();
 	}
 
 	private void add_menu(JMenu menu, String label, String action) {
@@ -420,9 +443,9 @@ 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", map);
+		displays.add(map);
 
 		gps_info = new TeleGPSInfo();
 		pane.add("Info", gps_info);
@@ -447,7 +470,7 @@ public class TeleGPS
 		pack();
 		setVisible(true);
 
-		++number_of_windows;
+		add_window();
 
 		status_update = new TeleGPSStatusUpdate(telegps_status);
 
@@ -485,6 +508,18 @@ public class TeleGPS
 		return new AltosReplayReader(states.iterator(), file);
 	}
 
+	static boolean process_graph(File file) {
+		AltosStateIterable states = record_iterable(file);
+		if (states == null)
+			return false;
+		try {
+			new TeleGPSGraphUI(states, file);
+		} catch (Exception e) {
+			return false;
+		}
+		return true;
+	}
+
 	static boolean process_replay(File file) {
 		AltosReplayReader new_reader = replay_file(file);
 		if (new_reader == null)
@@ -548,7 +583,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"))
@@ -568,10 +603,11 @@ public class TeleGPS
 			else {
 				File file = new File(args[i]);
 				switch (process) {
+				case process_none:
 				case process_graph:
-					++errors;
+					if (!process_graph(file))
+						++errors;
 					break;
-				case process_none:
 				case process_replay:
 					if (!process_replay(file))
 						++errors;
@@ -593,14 +629,14 @@ public class TeleGPS
 		}
 		if (errors != 0)
 			System.exit(errors);
-		if (!any_created) {
+		if (number_of_windows == 0) {
 			java.util.List<AltosDevice> devices = AltosUSBDevice.list(AltosLib.product_basestation);
 			if (devices != null)
 				for (AltosDevice device : devices) {
 					new TeleGPS(device);
 					any_created = true;
 				}
-			if (!any_created)
+			if (number_of_windows == 0)
 				new TeleGPS();
 		}
 	}