Merge branch 'branch-1.6' into debian

11 files changed, 127 insertions, 79 deletions

diff --git a/telegps/TeleGPS.java b/telegps/TeleGPS.java
index fe335176..0208e81d 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_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import java.text.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPS
 	extends AltosUIFrame
@@ -70,7 +71,7 @@ public class TeleGPS
 
 	JTabbedPane		pane;
 
-	AltosUIMap   		map;
+	AltosUIMapNew  		map;
 	TeleGPSInfo		gps_info;
 	TeleGPSState		gps_state;
 	AltosInfoTable		info_table;
@@ -172,7 +173,7 @@ public class TeleGPS
 	}
 
 	void load_maps() {
-		new AltosUIMapPreload(this);
+		new AltosUIMapPreloadNew(this);
 	}
 
 	void disconnect() {
@@ -372,7 +373,6 @@ public class TeleGPS
 				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) {
@@ -480,8 +480,6 @@ public class TeleGPS
 		bag = getContentPane();
 		bag.setLayout(new GridBagLayout());
 
-		GridBagConstraints c = new GridBagConstraints();
-
 		setTitle("TeleGPS");
 
 		menu_bar = new JMenuBar();
@@ -491,25 +489,16 @@ public class TeleGPS
 		monitor_menu = make_menu("Monitor", monitor_menu_entries);
 		device_menu = make_menu("Device", device_menu_entries);
 
+		set_inset(3);
 		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);
+		bag.add(frequencies, constraints (0, 1));
 
 		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);
+		bag.add(rates, constraints(1, 1));
+		next_row();
+		set_inset(0);
 
 		displays = new LinkedList<AltosFlightDisplay>();
 
@@ -517,13 +506,9 @@ public class TeleGPS
 
 		/* TeleGPS status is always visible */
 		telegps_status = new TeleGPSStatus();
-		c.gridx = 0;
-		c.gridy = 1;
-		c.fill = GridBagConstraints.HORIZONTAL;
-		c.weightx = 1;
-		c.gridwidth = 2;
-		bag.add(telegps_status, c);
-		c.gridwidth = 1;
+		bag.add(telegps_status, constraints(0, 3, GridBagConstraints.HORIZONTAL));
+		next_row();
+
 		displays.add(telegps_status);
 
 
@@ -533,15 +518,9 @@ public class TeleGPS
 		pane = new JTabbedPane();
 
 		/* Make the tabbed pane use the rest of the window space */
-		c.gridx = 0;
-		c.gridy = 2;
-		c.fill = GridBagConstraints.BOTH;
-		c.weightx = 1;
-		c.weighty = 1;
-		c.gridwidth = 2;
-		bag.add(pane, c);
-
-		map = new AltosUIMap();
+		bag.add(pane, constraints(0, 3, GridBagConstraints.BOTH));
+
+		map = new AltosUIMapNew();
 		pane.add(map.getName(), map);
 		displays.add(map);
 
@@ -650,7 +629,6 @@ public class TeleGPS
 	public static void help(int code) {
 		System.out.printf("Usage: altosui [OPTION]... [FILE]...\n");
 		System.out.printf("  Options:\n");
-		System.out.printf("    --fetchmaps <lat> <lon>\tpre-fetch maps for site map view\n");
 		System.out.printf("    --replay <filename>\t\trelive the glory of past flights \n");
 		System.out.printf("    --graph <filename>\t\tgraph a flight\n");
 		System.out.printf("    --csv\tgenerate comma separated output for spreadsheets, etc\n");
@@ -675,16 +653,7 @@ public class TeleGPS
 		for (int i = 0; i < args.length; i++) {
 			if (args[i].equals("--help"))
 				help(0);
-			else if (args[i].equals("--fetchmaps")) {
-				if (args.length < i + 3) {
-					help(1);
-				} else {
-					double lat = Double.parseDouble(args[i+1]);
-					double lon = Double.parseDouble(args[i+2]);
-					AltosUIMap.prefetch_maps(lat, lon);
-					i += 2;
-				}
-			} else if (args[i].equals("--replay"))
+			else if (args[i].equals("--replay"))
 				process = process_replay;
 			else if (args[i].equals("--kml"))
 				process = process_kml;
diff --git a/telegps/TeleGPSConfig.java b/telegps/TeleGPSConfig.java
index 55763e22..e2cf1258 100644
--- a/telegps/TeleGPSConfig.java
+++ b/telegps/TeleGPSConfig.java
@@ -22,8 +22,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.text.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSConfig implements ActionListener {
 
diff --git a/telegps/TeleGPSConfigUI.java b/telegps/TeleGPSConfigUI.java
index 5e700b72..8d4916aa 100644
--- a/telegps/TeleGPSConfigUI.java
+++ b/telegps/TeleGPSConfigUI.java
@@ -17,12 +17,13 @@
 
 package org.altusmetrum.telegps;
 
+import java.text.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSConfigUI
 	extends AltosUIDialog
@@ -40,6 +41,7 @@ public class TeleGPSConfigUI
 	JLabel			rate_label;
 	JLabel			aprs_interval_label;
 	JLabel			aprs_ssid_label;
+	JLabel			aprs_format_label;
 	JLabel			flight_log_max_label;
 	JLabel			callsign_label;
 	JLabel			tracker_motion_label;
@@ -57,6 +59,7 @@ public class TeleGPSConfigUI
 	AltosUIRateList		rate_value;
 	JComboBox<String>	aprs_interval_value;
 	JComboBox<Integer>	aprs_ssid_value;
+	JComboBox<String>	aprs_format_value;
 	JComboBox<String>	flight_log_max_value;
 	JTextField		callsign_value;
 	JComboBox<String>	tracker_motion_value;
@@ -165,11 +168,20 @@ public class TeleGPSConfigUI
 
 	void set_aprs_ssid_tool_tip() {
 		if (aprs_ssid_value.isEnabled())
-			aprs_interval_value.setToolTipText("Set the APRS SSID (secondary station identifier)");
-		else if (aprs_interval_value.isEnabled())
-			aprs_interval_value.setToolTipText("Software version doesn't support setting the APRS SSID");
+			aprs_ssid_value.setToolTipText("Set the APRS SSID (secondary station identifier)");
+		else if (aprs_ssid_value.isEnabled())
+			aprs_ssid_value.setToolTipText("Software version doesn't support setting the APRS SSID");
 		else
-			aprs_interval_value.setToolTipText("Hardware doesn't support APRS");
+			aprs_ssid_value.setToolTipText("Hardware doesn't support APRS");
+	}
+
+	void set_aprs_format_tool_tip() {
+		if (aprs_format_value.isEnabled())
+			aprs_format_value.setToolTipText("Set the APRS format (compressed/uncompressed)");
+		else if (aprs_format_value.isEnabled())
+			aprs_format_value.setToolTipText("Software version doesn't support setting the APRS format");
+		else
+			aprs_format_value.setToolTipText("Hardware doesn't support APRS");
 	}
 
 	void set_flight_log_max_tool_tip() {
@@ -413,6 +425,33 @@ public class TeleGPSConfigUI
 		set_aprs_ssid_tool_tip();
 		row++;
 
+		/* APRS format */
+		c = new GridBagConstraints();
+		c.gridx = 0; c.gridy = row;
+		c.gridwidth = 4;
+		c.fill = GridBagConstraints.NONE;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = il;
+		c.ipady = 5;
+		aprs_format_label = new JLabel("APRS format:");
+		pane.add(aprs_format_label, c);
+
+		c = new GridBagConstraints();
+		c.gridx = 4; c.gridy = row;
+		c.gridwidth = 4;
+		c.fill = GridBagConstraints.HORIZONTAL;
+		c.weightx = 1;
+		c.anchor = GridBagConstraints.LINE_START;
+		c.insets = ir;
+		c.ipady = 5;
+		aprs_format_value = new JComboBox<String>(AltosLib.ao_aprs_format_name);
+		aprs_format_value.setEditable(false);
+		aprs_format_value.addItemListener(this);
+		aprs_format_value.setMaximumRowCount(AltosLib.ao_aprs_format_name.length);
+		pane.add(aprs_format_value, c);
+		set_aprs_format_tool_tip();
+		row++;
+
 		/* Callsign */
 		c = new GridBagConstraints();
 		c.gridx = 0; c.gridy = row;
@@ -648,7 +687,11 @@ public class TeleGPSConfigUI
 			String motion = tracker_motion_value.getSelectedItem().toString();
 			tracker_motion_label.setText(get_tracker_motion_label());
 			set_tracker_motion_values();
-			set_tracker_motion((int) (AltosConvert.height.parse(motion, !imperial_units) + 0.5));
+			try {
+				int m = (int) (AltosConvert.height.parse_locale(motion, !imperial_units) + 0.5);
+				set_tracker_motion(m);
+			} catch (ParseException pe) {
+			}
 		}
 		if (!was_dirty)
 			set_clean();
@@ -848,7 +891,12 @@ public class TeleGPSConfigUI
 	}
 
 	public int tracker_motion() throws AltosConfigDataException {
-		return (int) AltosConvert.height.parse(tracker_motion_value.getSelectedItem().toString());
+		String str = tracker_motion_value.getSelectedItem().toString();
+		try {
+			return (int) (AltosConvert.height.parse_locale(str) + 0.5);
+		} catch (ParseException pe) {
+			throw new AltosConfigDataException("invalid tracker motion %s", str);
+		}
 	}
 
 	public void set_tracker_interval(int tracker_interval) {
@@ -894,4 +942,16 @@ public class TeleGPSConfigUI
 		Integer i = (Integer) aprs_ssid_value.getSelectedItem();
 		return i;
 	}
+
+	public void set_aprs_format(int new_aprs_format) {
+		aprs_format_value.setVisible(new_aprs_format >= 0);
+		aprs_format_label.setVisible(new_aprs_format >= 0);
+
+		aprs_format_value.setSelectedIndex(Math.max(0,new_aprs_format));
+		set_aprs_format_tool_tip();
+	}
+
+	public int aprs_format() throws AltosConfigDataException {
+		return aprs_format_value.getSelectedIndex();
+	}
 }
diff --git a/telegps/TeleGPSDisplayThread.java b/telegps/TeleGPSDisplayThread.java
index 09610f59..fa394b17 100644
--- a/telegps/TeleGPSDisplayThread.java
+++ b/telegps/TeleGPSDisplayThread.java
@@ -21,8 +21,8 @@ import java.awt.*;
 import javax.swing.*;
 import java.io.*;
 import java.text.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSDisplayThread extends Thread {
 
diff --git a/telegps/TeleGPSGraphUI.java b/telegps/TeleGPSGraphUI.java
index d3adc748..8fe479cc 100644
--- a/telegps/TeleGPSGraphUI.java
+++ b/telegps/TeleGPSGraphUI.java
@@ -26,8 +26,8 @@ import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
 import java.util.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 import org.jfree.chart.ChartPanel;
 import org.jfree.chart.JFreeChart;
@@ -38,7 +38,7 @@ public class TeleGPSGraphUI extends AltosUIFrame
 	JTabbedPane		pane;
 	AltosGraph		graph;
 	AltosUIEnable		enable;
-	AltosUIMap		map;
+	AltosUIMapNew		map;
 	AltosState		state;
 	AltosFlightStats	stats;
 	AltosGraphDataSet	graphDataSet;
@@ -69,7 +69,7 @@ public class TeleGPSGraphUI extends AltosUIFrame
 		graph = new AltosGraph(enable, stats, graphDataSet);
 		statsTable = new AltosFlightStatsTable(stats);
 
-		map = new AltosUIMap();
+		map = new AltosUIMapNew();
 
 		pane.add("Graph", graph.panel);
 		pane.add("Configure Graph", enable);
diff --git a/telegps/TeleGPSInfo.java b/telegps/TeleGPSInfo.java
index f20a8830..6baccce9 100644
--- a/telegps/TeleGPSInfo.java
+++ b/telegps/TeleGPSInfo.java
@@ -21,8 +21,8 @@ import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSInfo extends AltosUIFlightTab {
 
diff --git a/telegps/TeleGPSPreferences.java b/telegps/TeleGPSPreferences.java
index 6d7b8985..d0b843e1 100644
--- a/telegps/TeleGPSPreferences.java
+++ b/telegps/TeleGPSPreferences.java
@@ -22,7 +22,7 @@ import java.awt.event.*;
 import java.beans.*;
 import javax.swing.*;
 import javax.swing.event.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSPreferences
 	extends AltosUIConfigure
diff --git a/telegps/TeleGPSState.java b/telegps/TeleGPSState.java
index 18f500b9..dac7da52 100644
--- a/telegps/TeleGPSState.java
+++ b/telegps/TeleGPSState.java
@@ -21,8 +21,8 @@ import java.util.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSState extends AltosUIFlightTab {
 
@@ -161,6 +161,26 @@ public class TeleGPSState extends AltosUIFlightTab {
 		}
 	}
 
+	class ReceiverBattery extends AltosUIVoltageIndicator {
+
+		public double voltage(AltosState state) { return AltosLib.MISSING; }
+
+		public double good() { return AltosLib.ao_battery_good; }
+
+		public boolean hide(AltosState state, AltosListenerState listener_state, int i) {
+			return value(state, listener_state, i) == AltosLib.MISSING;
+		}
+
+		public double value(AltosState state, AltosListenerState listener_state, int i) {
+			if (listener_state == null)
+				return AltosLib.MISSING;
+			return listener_state.battery;
+		}
+
+		public ReceiverBattery (AltosUIFlightTab container, int y) {
+			super(container, y, "Receiver Battery", 2);
+		}
+	}
 
 	public void labels(Container container, int y) {
 		GridBagLayout		layout = (GridBagLayout)(container.getLayout());
@@ -203,5 +223,6 @@ public class TeleGPSState extends AltosUIFlightTab {
 		add(new FirmwareVersion(this, y++));
 		add(new FlightLogMax(this, y++));
 		add(new BatteryVoltage(this, y++));
+		add(new ReceiverBattery(this, y++));
 	}
 }
diff --git a/telegps/TeleGPSStatus.java b/telegps/TeleGPSStatus.java
index 050a8449..896df9d4 100644
--- a/telegps/TeleGPSStatus.java
+++ b/telegps/TeleGPSStatus.java
@@ -19,8 +19,8 @@ package org.altusmetrum.telegps;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_6.*;
-import org.altusmetrum.altosuilib_6.*;
+import org.altusmetrum.altoslib_8.*;
+import org.altusmetrum.altosuilib_8.*;
 
 public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
diff --git a/telegps/TeleGPSStatusUpdate.java b/telegps/TeleGPSStatusUpdate.java
index 9c085a5b..eef0a034 100644
--- a/telegps/TeleGPSStatusUpdate.java
+++ b/telegps/TeleGPSStatusUpdate.java
@@ -18,7 +18,7 @@
 package org.altusmetrum.telegps;
 
 import java.awt.event.*;
-import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altoslib_8.*;
 
 public class TeleGPSStatusUpdate implements ActionListener {
 
diff --git a/telegps/telegps-windows.nsi.in b/telegps/telegps-windows.nsi.in
index 44656715..b0b5d6a6 100644
--- a/telegps/telegps-windows.nsi.in
+++ b/telegps/telegps-windows.nsi.in
@@ -103,16 +103,17 @@ Section "${REG_NAME} Application"
 	File "freetts.jar"
 	File "jfreechart.jar"
 	File "jcommon.jar"
+	File "../icon/${WIN_APP_EXE}"
 
 	File "*.dll"
 
 	File "../icon/${WIN_APP_ICON}"
 
-	CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}" "" "$INSTDIR\${WIN_APP_ICON}"
+	CreateShortCut "$SMPROGRAMS\${REG_NAME}.lnk" "$INSTDIR\${WIN_APP_EXE}" "" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
 Section "${REG_NAME} Desktop Shortcut"
-	CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${FAT_NAME}"  "" "$INSTDIR\${WIN_APP_ICON}"
+	CreateShortCut "$DESKTOP\${REG_NAME}.lnk" "$INSTDIR\${WIN_APP_EXE}"  "" "$INSTDIR\${WIN_APP_ICON}"
 SectionEnd
 
 Section "TeleGPS, TeleDongle and TeleBT Firmware"
@@ -141,7 +142,6 @@ Section "File Associations"
 
 	SetOutPath $INSTDIR
 
-	File "../icon/${WIN_APP_EXE}"
 	File "../icon/${WIN_TELEM_EXE}"
 	File "../icon/${WIN_EEPROM_EXE}"
 
@@ -153,15 +153,13 @@ Section "File Associations"
 	DeleteRegKey   HKCR ".telem\${PROG_ID_EEPROM}"
 	DeleteRegValue HKCR ".telem\OpenWithProgids" "${PROG_ID_EEPROM}"
 
-	SearchPath $1 "javaw.exe"
-
 	; .eeprom elements
 
 	WriteRegStr HKCR "${PROG_ID_EEPROM}"		""				"Altus Metrum Log File"
 	WriteRegStr HKCR "${PROG_ID_EEPROM}"		"FriendlyTypeName"		"Altus Metrum Log File"
 	WriteRegStr HKCR "${PROG_ID_EEPROM}\CurVer"	""				"${PROG_ID_EEPROM}"
 	WriteRegStr HKCR "${PROG_ID_EEPROM}\DefaultIcon" ""				'"$INSTDIR\${WIN_EEPROM_EXE}",-101'
-  WriteRegExpandStr HKCR "${PROG_ID_EEPROM}\shell\open\command" ""			'"$1" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+  WriteRegExpandStr HKCR "${PROG_ID_EEPROM}\shell\open\command" ""			'"$INSTDIR\${WIN_APP_EXE}" "%1"'
 
 	WriteRegStr HKCR ".eeprom"			""				"${PROG_ID_EEPROM}"
 	WriteRegStr HKCR ".eeprom"			"PerceivedType"			"Altus Metrum Log File"
@@ -176,7 +174,7 @@ Section "File Associations"
 	WriteRegStr HKCR "${PROG_ID_TELEM}"		"FriendlyTypeName"		"Altus Metrum Telemetry File"
 	WriteRegStr HKCR "${PROG_ID_TELEM}\CurVer"	""				"${PROG_ID_TELEM}"
 	WriteRegStr HKCR "${PROG_ID_TELEM}\DefaultIcon" ""				'"$INSTDIR\${WIN_TELEM_EXE}",-101'
-  WriteRegExpandStr HKCR "${PROG_ID_TELEM}\shell\open\command" ""			'"$1" -Djava.library.path="$INSTDIR" -jar "$INSTDIR\${FAT_NAME}" "%1"'
+  WriteRegExpandStr HKCR "${PROG_ID_TELEM}\shell\open\command" ""			'"$INSTDIR\${WIN_APP_EXE}" "%1"'
 
 	WriteRegStr HKCR ".telem"			""				"${PROG_ID_TELEM}"
 	WriteRegStr HKCR ".telem"			"PerceivedType"			"Altus Metrum Telemetry File"