X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightStatus.java;h=0be7bb51b811b9fdcec6d0d89beee9c454622f3f;hp=ed27338432564682dcfa327a8e11abc5a044edff;hb=de8d9c5630ae46378c50faf97f7d2e97fe139e30;hpb=cbfbaabb39f9f7709d00cf3dc63cc1bc7563062e

diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index ed273384..0be7bb51 100644
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -18,15 +18,8 @@
 package altosui;
 
 import java.awt.*;
-import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.filechooser.FileNameExtensionFilter;
-import javax.swing.table.*;
-import java.io.*;
-import java.util.*;
-import java.text.*;
-import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -35,7 +28,7 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		JLabel		label;
 		JTextField	value;
 
-		void show(AltosState state, int crc_errors) {}
+		void show(AltosState state, AltosListenerState listener_state) {}
 
 		void reset() {
 			value.setText("");
@@ -71,8 +64,8 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	}
 
 	class Call extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			value.setText(state.data.callsign);
+		void show(AltosState state, AltosListenerState listener_state) {
+			value.setText(state.callsign);
 		}
 		public Call (GridBagLayout layout, int x) {
 			super (layout, x, "Callsign");
@@ -82,8 +75,11 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	Call call;
 
 	class Serial extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			value.setText(String.format("%d", state.data.serial));
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (state.serial == AltosRecord.MISSING)
+				value.setText("none");
+			else
+				value.setText(String.format("%d", state.serial));
 		}
 		public Serial (GridBagLayout layout, int x) {
 			super (layout, x, "Serial");
@@ -93,8 +89,11 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	Serial serial;
 
 	class Flight extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			value.setText(String.format("%d", state.data.flight));
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (state.flight == AltosRecord.MISSING)
+				value.setText("none");
+			else
+				value.setText(String.format("%d", state.flight));
 		}
 		public Flight (GridBagLayout layout, int x) {
 			super (layout, x, "Flight");
@@ -104,8 +103,8 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	Flight flight;
 
 	class FlightState extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			value.setText(state.data.state());
+		void show(AltosState state, AltosListenerState listener_state) {
+			value.setText(state.state_name());
 		}
 		public FlightState (GridBagLayout layout, int x) {
 			super (layout, x, "State");
@@ -115,22 +114,35 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	FlightState flight_state;
 
 	class RSSI extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			value.setText(String.format("%d", state.data.rssi));
+		void show(AltosState state, AltosListenerState listener_state) {
+			value.setText(String.format("%d", state.rssi()));
 		}
 		public RSSI (GridBagLayout layout, int x) {
-			super (layout, x, "RSSI (dBm)");
+			super (layout, x, "RSSI");
 		}
 	}
 
 	RSSI rssi;
 
+	class LastPacket extends FlightValue {
+		void show(AltosState state, AltosListenerState listener_state) {
+			long secs = (System.currentTimeMillis() - state.report_time + 500) / 1000;
+			value.setText(String.format("%d", secs));
+		}
+		public LastPacket(GridBagLayout layout, int x) {
+			super (layout, x, "Age");
+		}
+	}
+
+	LastPacket last_packet;
+
 	public void reset () {
 		call.reset();
 		serial.reset();
 		flight.reset();
 		flight_state.reset();
 		rssi.reset();
+		last_packet.reset();
 	}
 
 	public void set_font () {
@@ -139,14 +151,16 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		flight.set_font();
 		flight_state.set_font();
 		rssi.set_font();
+		last_packet.set_font();
 	}
 
-	public void show (AltosState state, int crc_errors) {
-		call.show(state, crc_errors);
-		serial.show(state, crc_errors);
-		flight.show(state, crc_errors);
-		flight_state.show(state, crc_errors);
-		rssi.show(state, crc_errors);
+	public void show (AltosState state, AltosListenerState listener_state) {
+		call.show(state, listener_state);
+		serial.show(state, listener_state);
+		flight.show(state, listener_state);
+		flight_state.show(state, listener_state);
+		rssi.show(state, listener_state);
+		last_packet.show(state, listener_state);
 	}
 
 	public int height() {
@@ -164,5 +178,6 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		flight = new Flight(layout, 2);
 		flight_state = new FlightState(layout, 3);
 		rssi = new RSSI(layout, 4);
+		last_packet = new LastPacket(layout, 5);
 	}
 }