X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightStatus.java;h=b27deba903a589af3c3b86cb29c23920ed886083;hp=b97c8dc61e004024c9e38868805529a0a30595cc;hb=8044eb8e23366e91c741060939baff5137f841c7;hpb=52d3cad4f744140e1aa06fdfc0d49a0cf8734fd4

diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index b97c8dc6..b27deba9 100644
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -19,7 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
@@ -28,7 +29,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("");
@@ -39,6 +40,11 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 			value.setFont(Altos.status_font);
 		}
 
+		void setVisible(boolean visible) {
+			label.setVisible(visible);
+			value.setVisible(visible);
+		}
+
 		public FlightValue (GridBagLayout layout, int x, String text) {
 			GridBagConstraints	c = new GridBagConstraints();
 			c.insets = new Insets(5, 5, 5, 5);
@@ -55,6 +61,7 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 			add(label);
 
 			value = new JTextField("");
+			value.setEditable(false);
 			value.setFont(Altos.status_font);
 			value.setHorizontalAlignment(SwingConstants.CENTER);
 			c.gridx = x; c.gridy = 1;
@@ -64,8 +71,25 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	}
 
 	class Call extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			value.setText(state.data.callsign);
+
+		String last_call = "";
+
+		boolean same_call(String call) {
+			if (last_call == null)
+				return call == null;
+			else
+				return last_call.equals(call);
+		}
+
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (!same_call(state.callsign)) {
+				value.setText(state.callsign);
+				if (state.callsign == null)
+					setVisible(false);
+				else
+					setVisible(true);
+				last_call = state.callsign;
+			}
 		}
 		public Call (GridBagLayout layout, int x) {
 			super (layout, x, "Callsign");
@@ -75,8 +99,16 @@ 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));
+
+		int	last_serial = -1;
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (state.serial != last_serial) {
+				if (state.serial == AltosLib.MISSING)
+					value.setText("none");
+				else
+					value.setText(String.format("%d", state.serial));
+				last_serial = state.serial;
+			}
 		}
 		public Serial (GridBagLayout layout, int x) {
 			super (layout, x, "Serial");
@@ -86,8 +118,17 @@ 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));
+
+		int	last_flight = -1;
+
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (state.flight != last_flight) {
+				if (state.flight == AltosLib.MISSING)
+					value.setText("none");
+				else
+					value.setText(String.format("%d", state.flight));
+				last_flight = state.flight;
+			}
 		}
 		public Flight (GridBagLayout layout, int x) {
 			super (layout, x, "Flight");
@@ -97,8 +138,14 @@ 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());
+
+		int	last_state = -1;
+
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (state.state != last_state) {
+				value.setText(state.state_name());
+				last_state = state.state;
+			}
 		}
 		public FlightState (GridBagLayout layout, int x) {
 			super (layout, x, "State");
@@ -108,8 +155,18 @@ 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));
+
+		int	last_rssi = 10000;
+
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (state.rssi() != last_rssi) {
+				value.setText(String.format("%d", state.rssi()));
+				if (state.rssi == AltosLib.MISSING)
+					setVisible(false);
+				else
+					setVisible(true);
+				last_rssi = state.rssi();
+			}
 		}
 		public RSSI (GridBagLayout layout, int x) {
 			super (layout, x, "RSSI");
@@ -119,9 +176,15 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	RSSI rssi;
 
 	class LastPacket extends FlightValue {
-		void show(AltosState state, int crc_errors) {
-			long secs = (System.currentTimeMillis() - state.report_time + 500) / 1000;
-			value.setText(String.format("%d", secs));
+
+		long	last_secs = -1;
+
+		void show(AltosState state, AltosListenerState listener_state) {
+			long secs = (System.currentTimeMillis() - state.received_time + 500) / 1000;
+			if (secs != last_secs) {
+				value.setText(String.format("%d", secs));
+				last_secs = secs;
+			}
 		}
 		public LastPacket(GridBagLayout layout, int x) {
 			super (layout, x, "Age");
@@ -139,7 +202,7 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		last_packet.reset();
 	}
 
-	public void set_font () {
+	public void font_size_changed(int font_size) {
 		call.set_font();
 		serial.set_font();
 		flight.set_font();
@@ -148,13 +211,16 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		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);
-		last_packet.show(state, crc_errors);
+	public void units_changed(boolean imperial_units) {
+	}
+
+	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() {