X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosDisplayThread.java;h=3e719130a6a7c67475f41d98a8740b9904e66e01;hb=0ecf033110084f1a8be98282d7029dc14f70dab5;hp=b15472edf7393a5764b6066cc7ae8a124609249d;hpb=16916be51d746b1e1057b3219e5bec8f8814259e;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosDisplayThread.java b/ao-tools/altosui/AltosDisplayThread.java
index b15472ed..3e719130 100644
--- a/ao-tools/altosui/AltosDisplayThread.java
+++ b/ao-tools/altosui/AltosDisplayThread.java
@@ -36,8 +36,12 @@ public class AltosDisplayThread extends Thread {
 	String			name;
 	AltosFlightReader	reader;
 	int			crc_errors;
-	AltosStatusTable	flightStatus;
-	AltosInfoTable		flightInfo;
+	AltosFlightDisplay	display;
+
+	synchronized void show(AltosState state, int crc_errors) {
+		if (state != null)
+			display.show(state, crc_errors);
+	}
 
 	class IdleThread extends Thread {
 
@@ -65,8 +69,10 @@ public class AltosDisplayThread extends Thread {
 			    state.state < Altos.ao_flight_landed &&
 			    state.range >= 0)
 			{
-				voice.speak("Height %d, bearing %d, elevation %d, range %d.\n",
+				voice.speak("Height %d, bearing %s %d, elevation %d, range %d.\n",
 					    (int) (state.height + 0.5),
+                        state.from_pad.bearing_words(
+                            AltosGreatCircle.BEARING_VOICE),
 					    (int) (state.from_pad.bearing + 0.5),
 					    (int) (state.elevation + 0.5),
 					    (int) (state.range + 0.5));
@@ -94,6 +100,10 @@ public class AltosDisplayThread extends Thread {
 						    (int) (state.from_pad.bearing + 0.5),
 						    (int) (state.from_pad.distance + 0.5));
 				++reported_landing;
+				if (state.state != Altos.ao_flight_landed) {
+					state.state = Altos.ao_flight_landed;
+					show(state, 0);
+				}
 			}
 		}
 
@@ -106,10 +116,6 @@ public class AltosDisplayThread extends Thread {
 		}
 
 		public void run () {
-
-			reported_landing = 0;
-			state = null;
-			report_interval = 10000;
 			try {
 				for (;;) {
 					set_report_time();
@@ -149,6 +155,12 @@ public class AltosDisplayThread extends Thread {
 			} else if (spoken)
 				set_report_time();
 		}
+
+		public IdleThread() {
+			state = null;
+			reported_landing = 0;
+			report_interval = 10000;
+		}
 	}
 
 	boolean tell(AltosState state, AltosState old_state) {
@@ -181,13 +193,6 @@ public class AltosDisplayThread extends Thread {
 		return ret;
 	}
 
-	void show(AltosState state, int crc_errors) {
-		if (state != null) {
-			flightStatus.set(state);
-			flightInfo.show(state, crc_errors);
-		}
-	}
-
 	public void run() {
 		boolean		interrupted = false;
 		String		line;
@@ -197,7 +202,7 @@ public class AltosDisplayThread extends Thread {
 
 		idle_thread = new IdleThread();
 
-		flightInfo.clear();
+		display.reset();
 		try {
 			for (;;) {
 				try {
@@ -235,11 +240,10 @@ public class AltosDisplayThread extends Thread {
 		}
 	}
 
-	public AltosDisplayThread(Frame in_parent, AltosVoice in_voice, AltosStatusTable in_status, AltosInfoTable in_info, AltosFlightReader in_reader) {
+	public AltosDisplayThread(Frame in_parent, AltosVoice in_voice, AltosFlightDisplay in_display, AltosFlightReader in_reader) {
 		parent = in_parent;
 		voice = in_voice;
-		flightStatus = in_status;
-		flightInfo = in_info;
+		display = in_display;
 		reader = in_reader;
 	}
 }