X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=telegps%2FTeleGPS.java;h=0e46a78006072f887c910c1230b3d5735ed85fde;hb=f41fe2291891b28327c332098bdc601bc75fc4c0;hp=e78c2124ab5142102b7a6da44fc55e49b720dc19;hpb=7767a045d446ea2bc5fe1ec98d89274155f956c4;p=fw%2Faltos

diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index e78c2124..0e46a780 100644
--- a/telegps/TeleGPS.java
+++ b/telegps/TeleGPS.java
@@ -23,8 +23,9 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_5.*;
-import org.altusmetrum.altosuilib_3.*;
+import java.text.*;
+import org.altusmetrum.altoslib_7.*;
+import org.altusmetrum.altosuilib_7.*;
 
 public class TeleGPS
 	extends AltosUIFrame
@@ -32,12 +33,12 @@ public class TeleGPS
 {
 
 	static String[] telegps_icon_names = {
-		"/telegps-16.png",
-		"/telegps-32.png",
-		"/telegps-48.png",
-		"/telegps-64.png",
-		"/telegps-128.png",
-		"/telegps-256.png"
+		"/altusmetrum-telegps-16.png",
+		"/altusmetrum-telegps-32.png",
+		"/altusmetrum-telegps-48.png",
+		"/altusmetrum-telegps-64.png",
+		"/altusmetrum-telegps-128.png",
+		"/altusmetrum-telegps-256.png"
 	};
 
 	static { set_icon_names(telegps_icon_names); }
@@ -58,18 +59,19 @@ public class TeleGPS
 	JMenu			file_menu;
 	JMenu			monitor_menu;
 	JMenu			device_menu;
-	AltosFreqList		frequencies;
+	AltosUIFreqList		frequencies;
 	ActionListener		frequency_listener;
+	AltosUIRateList		rates;
+	ActionListener		rate_listener;
 
 	Container		bag;
 
 	TeleGPSStatus		telegps_status;
 	TeleGPSStatusUpdate	status_update;
-	javax.swing.Timer	status_timer;
 
 	JTabbedPane		pane;
 
-	AltosUIMap   		map;
+	AltosUIMapNew  		map;
 	TeleGPSInfo		gps_info;
 	TeleGPSState		gps_state;
 	AltosInfoTable		info_table;
@@ -145,6 +147,7 @@ public class TeleGPS
 	public void show(AltosState state, AltosListenerState listener_state) {
 		try {
 			status_update.saved_state = state;
+			status_update.saved_listener_state = listener_state;
 
 			if (state == null)
 				state = new AltosState();
@@ -170,20 +173,17 @@ public class TeleGPS
 	}
 
 	void load_maps() {
-		new AltosUIMapPreload(this);
+		new AltosUIMapPreloadNew(this);
 	}
 
 	void disconnect() {
 		setTitle("TeleGPS");
 		stop_display();
-		if (status_timer != null) {
-			status_timer.stop();
-			status_timer = null;
-			status_update = null;
-		}
+		telegps_status.stop();
 
 		telegps_status.disable_receive();
 		disable_frequency_menu();
+		disable_rate_menu();
 	}
 
 	void connect(AltosDevice device) {
@@ -351,32 +351,66 @@ public class TeleGPS
 		frequencies.set_product("Monitor");
 		frequencies.set_serial(serial);
 		frequencies.set_frequency(AltosUIPreferences.frequency(serial));
+		frequencies.setEnabled(true);
 
-		menu_bar.add(frequencies);
-		menu_bar.repaint();
 	}
 
 	void disable_frequency_menu() {
-		if (frequency_listener == null)
-			return;
-		frequencies.removeActionListener(frequency_listener);
-		menu_bar.remove(frequencies);
-		menu_bar.repaint();
-		frequency_listener = null;
+		if (frequency_listener != null) {
+			frequencies.removeActionListener(frequency_listener);
+			frequencies.setEnabled(false);
+			frequency_listener = null;
+		}
+
+	}
+
+	void enable_rate_menu(int serial, final AltosFlightReader reader) {
+
+		if (rate_listener != null)
+			disable_rate_menu();
+
+		rate_listener = new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					int rate = rates.rate();
+					try {
+						System.out.printf("set rate %d\n", rate);
+						reader.set_telemetry_rate(rate);
+					} catch (TimeoutException te) {
+					} catch (InterruptedException ie) {
+					}
+					reader.save_telemetry_rate();
+				}
+			};
+
+		rates.addActionListener(rate_listener);
+		rates.set_product("Monitor");
+		rates.set_serial(serial);
+		rates.set_rate(AltosUIPreferences.telemetry_rate(serial));
+		rates.setEnabled(reader.supports_telemetry_rate(AltosLib.ao_telemetry_rate_2400));
+	}
+
+	void disable_rate_menu() {
+		if (rate_listener != null) {
+			rates.removeActionListener(rate_listener);
+			rates.setEnabled(false);
+			rate_listener = null;
+		}
+
 	}
 
 	public void set_reader(AltosFlightReader reader, AltosDevice device) {
 		status_update = new TeleGPSStatusUpdate(telegps_status);
 
-		status_timer = new javax.swing.Timer(100, status_update);
-		status_timer.start();
+		telegps_status.start(status_update);
 
 		setTitle(String.format("TeleGPS %s", reader.name));
 		thread = new TeleGPSDisplayThread(this, voice(), this, reader);
 		thread.start();
 
-		if (device != null)
+		if (device != null) {
 			enable_frequency_menu(device.getSerial(), reader);
+			enable_rate_menu(device.getSerial(), reader);
+		}
 	}
 
 	static int	number_of_windows;
@@ -457,7 +491,26 @@ public class TeleGPS
 		file_menu = make_menu("File", file_menu_entries);
 		monitor_menu = make_menu("Monitor", monitor_menu_entries);
 		device_menu = make_menu("Device", device_menu_entries);
-		frequencies = new AltosFreqList();
+
+		frequencies = new AltosUIFreqList();
+		frequencies.setEnabled(false);
+		c.gridx = 0;
+		c.gridy = 0;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.WEST;
+		c.weightx = 0;
+		c.gridwidth = 1;
+		bag.add(frequencies, c);
+
+		rates = new AltosUIRateList();
+		rates.setEnabled(false);
+		c.gridx = 1;
+		c.gridy = 0;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.WEST;
+		c.weightx = 0;
+		c.gridwidth = 1;
+		bag.add(rates, c);
 
 		displays = new LinkedList<AltosFlightDisplay>();
 
@@ -489,7 +542,7 @@ public class TeleGPS
 		c.gridwidth = 2;
 		bag.add(pane, c);
 
-		map = new AltosUIMap();
+		map = new AltosUIMapNew();
 		pane.add(map.getName(), map);
 		displays.add(map);
 
@@ -627,9 +680,13 @@ public class TeleGPS
 				if (args.length < i + 3) {
 					help(1);
 				} else {
-					double lat = Double.parseDouble(args[i+1]);
-					double lon = Double.parseDouble(args[i+2]);
+					try {
+					double lat = AltosParse.parse_double_locale(args[i+1]);
+					double lon = AltosParse.parse_double_locale(args[i+2]);
 					AltosUIMap.prefetch_maps(lat, lon);
+					} catch (ParseException e) {
+						System.out.printf("Can't parse number %s\n", e.toString());
+					}
 					i += 2;
 				}
 			} else if (args[i].equals("--replay"))