X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightStatus.java;h=a847d884067147339a7fa47438a151837809dd9d;hp=b467bbdee4d8b2154dc7f134e4cb58354ecafea5;hb=e70f3dca01b15b75b0b8795eb71bd12817af4800;hpb=238ddde1ffdb8521d06519306cfb76271ae552b9

diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index b467bbde..a847d884 100644
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -19,16 +19,27 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_3.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
 
-	public class FlightValue {
+	public abstract class FlightValue {
 		JLabel		label;
 		JTextField	value;
 
-		void show(AltosState state, AltosListenerState listener_state) {}
+		void show() {
+			label.setVisible(true);
+			value.setVisible(true);
+		}
+
+		void hide() {
+			label.setVisible(false);
+			value.setVisible(false);
+		}
+
+		abstract void show(AltosState state, AltosListenerState listener_state);
 
 		void reset() {
 			value.setText("");
@@ -60,6 +71,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;
@@ -69,13 +81,33 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	}
 
 	class Call extends FlightValue {
-		void show(AltosState state, AltosListenerState listener_state) {
-			value.setText(state.callsign);
-			if (state.callsign == null)
-				setVisible(false);
+
+		String last_call = "";
+
+		boolean same_call(String call) {
+			if (last_call == null)
+				return call == null;
 			else
-				setVisible(true);
+				return last_call.equals(call);
 		}
+
+		void show(AltosState state, AltosListenerState listener_state) {
+			if (!same_call(state.callsign)) {
+				show();
+				value.setText(state.callsign);
+				if (state.callsign == null)
+					setVisible(false);
+				else
+					setVisible(true);
+				last_call = state.callsign;
+			}
+		}
+
+		public void reset() {
+			super.reset();
+			last_call = "";
+		}
+
 		public Call (GridBagLayout layout, int x) {
 			super (layout, x, "Callsign");
 		}
@@ -84,12 +116,24 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	Call call;
 
 	class Serial extends FlightValue {
+
+		int	last_serial = -1;
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.serial == AltosLib.MISSING)
-				value.setText("none");
-			else
-				value.setText(String.format("%d", state.serial));
+			if (state.serial != last_serial) {
+				show();
+				if (state.serial == AltosLib.MISSING)
+					value.setText("none");
+				else
+					value.setText(String.format("%d", state.serial));
+				last_serial = state.serial;
+			}
+		}
+
+		public void reset() {
+			super.reset();
+			last_serial = -1;
 		}
+
 		public Serial (GridBagLayout layout, int x) {
 			super (layout, x, "Serial");
 		}
@@ -98,12 +142,25 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	Serial serial;
 
 	class Flight extends FlightValue {
+
+		int	last_flight = -1;
+
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.flight == AltosLib.MISSING)
-				value.setText("none");
-			else
-				value.setText(String.format("%d", state.flight));
+			if (state.flight != last_flight) {
+				show();
+				if (state.flight == AltosLib.MISSING)
+					value.setText("none");
+				else
+					value.setText(String.format("%d", state.flight));
+				last_flight = state.flight;
+			}
+		}
+
+		public void reset() {
+			super.reset();
+			last_flight = -1;
 		}
+
 		public Flight (GridBagLayout layout, int x) {
 			super (layout, x, "Flight");
 		}
@@ -112,9 +169,26 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	Flight flight;
 
 	class FlightState extends FlightValue {
+
+		int	last_state = -1;
+
 		void show(AltosState state, AltosListenerState listener_state) {
-			value.setText(state.state_name());
+			if (state.state != last_state) {
+				if (state.state == AltosLib.ao_flight_stateless)
+					hide();
+				else {
+					show();
+					value.setText(state.state_name());
+				}
+				last_state = state.state;
+			}
+		}
+
+		public void reset() {
+			super.reset();
+			last_state = -1;
 		}
+
 		public FlightState (GridBagLayout layout, int x) {
 			super (layout, x, "State");
 		}
@@ -123,13 +197,26 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	FlightState flight_state;
 
 	class RSSI extends FlightValue {
+
+		int	last_rssi = 10000;
+
 		void show(AltosState state, AltosListenerState listener_state) {
-			value.setText(String.format("%d", state.rssi()));
-			if (state.rssi == AltosLib.MISSING)
-				setVisible(false);
-			else
-				setVisible(true);
+			if (state.rssi() != last_rssi) {
+				show();
+				value.setText(String.format("%d", state.rssi()));
+				if (state.rssi == AltosLib.MISSING)
+					setVisible(false);
+				else
+					setVisible(true);
+				last_rssi = state.rssi();
+			}
+		}
+
+		public void reset() {
+			super.reset();
+			last_rssi = 10000;
 		}
+
 		public RSSI (GridBagLayout layout, int x) {
 			super (layout, x, "RSSI");
 		}
@@ -138,10 +225,26 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 	RSSI rssi;
 
 	class LastPacket extends FlightValue {
+
+		long	last_secs = -1;
+
 		void show(AltosState state, AltosListenerState listener_state) {
-			long secs = (System.currentTimeMillis() - state.received_time + 500) / 1000;
-			value.setText(String.format("%d", secs));
+			if (listener_state.running) {
+				long secs = (System.currentTimeMillis() - state.received_time + 500) / 1000;
+				if (secs != last_secs) {
+					value.setText(String.format("%d", secs));
+					last_secs = secs;
+				}
+			} else {
+				value.setText("done");
+			}
 		}
+
+		public void reset() {
+			super.reset();
+			last_secs = -1;
+		}
+
 		public LastPacket(GridBagLayout layout, int x) {
 			super (layout, x, "Age");
 		}
@@ -158,7 +261,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();
@@ -167,6 +270,9 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		last_packet.set_font();
 	}
 
+	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);
@@ -174,6 +280,8 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		flight_state.show(state, listener_state);
 		rssi.show(state, listener_state);
 		last_packet.show(state, listener_state);
+		if (!listener_state.running)
+			stop();
 	}
 
 	public int height() {
@@ -181,6 +289,24 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		return d.height;
 	}
 
+	public String getName() { return "Flight Status"; }
+
+	AltosFlightStatusUpdate	status_update;
+	javax.swing.Timer	timer;
+
+	public void start(AltosFlightStatusUpdate status_update) {
+		this.status_update = status_update;
+		timer = new javax.swing.Timer(100, status_update);
+		timer.start();
+	}
+
+	public void stop() {
+		if (timer != null) {
+			timer.stop();
+			timer = null;
+		}
+	}
+
 	public AltosFlightStatus() {
 		layout = new GridBagLayout();