X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=4915376645d71ca5543d4d87a5e3af8b331cfaf3;hb=6205547ec7191aab0259a8449520e966a96129e6;hp=eb376be479527d1fb26e468ec8dd75d40c853192;hpb=e844e8a0695e27af6f8e3e37a5e3bcc865b862e3;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index eb376be4..49153766 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -75,7 +75,7 @@ public class AltosUI extends JFrame {
 		String[] statusNames = { "Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" };
 		Object[][] statusData = { { "0", "pad", "-50", "0" } };
 
-		java.net.URL imgURL = AltosUI.class.getResource("/images/altus-metrum-16x16.jpg");
+		java.net.URL imgURL = AltosUI.class.getResource("/altus-metrum-16x16.jpg");
 		if (imgURL != null)
 			setIconImage(new ImageIcon(imgURL).getImage());
 
@@ -231,11 +231,19 @@ public class AltosUI extends JFrame {
 
 			if (state.npad > 0) {
 				if (state.from_pad != null) {
-					info_add_row(1, "Distance from pad", "%6.0f m", state.from_pad.distance);
-					info_add_row(1, "Direction from pad", "%6.0f°", state.from_pad.bearing);
+					info_add_row(1, "Distance from pad", "%6d m",
+						     (int) (state.from_pad.distance + 0.5));
+					info_add_row(1, "Direction from pad", "%6d°",
+						     (int) (state.from_pad.bearing + 0.5));
+					info_add_row(1, "Elevation from pad", "%6d°",
+						     (int) (state.elevation + 0.5));
+					info_add_row(1, "Range from pad", "%6d m",
+						     (int) (state.range + 0.5));
 				} else {
 					info_add_row(1, "Distance from pad", "unknown");
 					info_add_row(1, "Direction from pad", "unknown");
+					info_add_row(1, "Elevation from pad", "unknown");
+					info_add_row(1, "Range from pad", "unknown");
 				}
 				info_add_deg(1, "Pad latitude", state.pad_lat, 'N', 'S');
 				info_add_deg(1, "Pad longitude", state.pad_lon, 'E', 'W');
@@ -376,11 +384,12 @@ public class AltosUI extends JFrame {
 
 		AltosRecord read() throws InterruptedException, ParseException, AltosCRCException, IOException { return null; }
 
-		void close() { }
+		void close(boolean interrupted) { }
 
 		void update(AltosState state) throws InterruptedException { }
 
 		public void run() {
+			boolean		interrupted = false;
 			String		line;
 			AltosState	state = null;
 			AltosState	old_state = null;
@@ -410,14 +419,18 @@ public class AltosUI extends JFrame {
 					}
 				}
 			} catch (InterruptedException ee) {
+				interrupted = true;
 			} catch (IOException ie) {
 				JOptionPane.showMessageDialog(AltosUI.this,
 							      String.format("Error reading from \"%s\"", name),
 							      "Telemetry Read Error",
 							      JOptionPane.ERROR_MESSAGE);
 			} finally {
-				close();
+				close(interrupted);
 				idle_thread.interrupt();
+				try {
+					idle_thread.join();
+				} catch (InterruptedException ie) {}
 			}
 		}
 
@@ -438,7 +451,7 @@ public class AltosUI extends JFrame {
 			return new AltosTelemetry(l.line);
 		}
 
-		void close() {
+		void close(boolean interrupted) {
 			serial.close();
 			serial.remove_monitor(telem);
 		}
@@ -522,8 +535,9 @@ public class AltosUI extends JFrame {
 			return null;
 		}
 
-		public void close () {
-			report();
+		public void close (boolean interrupted) {
+			if (!interrupted)
+				report();
 		}
 
 		public ReplayThread(AltosReader in_reader, String in_name) {