X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosFlightStatus.java;h=2ff768700e029960dfe38e41a9b7d8d6f6708d5d;hp=ed27338432564682dcfa327a8e11abc5a044edff;hb=e4407afb514437ccd8db79ae29c6fa203140fa07;hpb=3d88e0493ab446d7c7011786390d30618a72d045

diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index ed273384..2ff76870 100644
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -18,24 +19,28 @@
 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_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
 	GridBagLayout	layout;
 
-	public class FlightValue {
+	public abstract class FlightValue {
 		JLabel		label;
 		JTextField	value;
 
-		void show(AltosState state, int crc_errors) {}
+		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("");
@@ -46,6 +51,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);
@@ -62,6 +72,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;
@@ -71,9 +82,33 @@ 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.cal_data.callsign)) {
+				show();
+				value.setText(state.cal_data.callsign);
+				if (state.cal_data.callsign == null)
+					setVisible(false);
+				else
+					setVisible(true);
+				last_call = state.cal_data.callsign;
+			}
 		}
+
+		public void reset() {
+			super.reset();
+			last_call = "";
+		}
+
 		public Call (GridBagLayout layout, int x) {
 			super (layout, x, "Callsign");
 		}
@@ -82,9 +117,25 @@ 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) {
+			AltosCalData	cal_data = state.cal_data;
+			if (cal_data.serial != last_serial) {
+				show();
+				if (cal_data.serial == AltosLib.MISSING)
+					value.setText("none");
+				else
+					value.setText(String.format("%d", cal_data.serial));
+				last_serial = cal_data.serial;
+			}
+		}
+
+		public void reset() {
+			super.reset();
+			last_serial = -1;
 		}
+
 		public Serial (GridBagLayout layout, int x) {
 			super (layout, x, "Serial");
 		}
@@ -93,9 +144,26 @@ 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) {
+			AltosCalData cal_data = state.cal_data;
+			if (cal_data.flight != last_flight) {
+				show();
+				if (cal_data.flight == AltosLib.MISSING)
+					value.setText("none");
+				else
+					value.setText(String.format("%d", cal_data.flight));
+				last_flight = cal_data.flight;
+			}
 		}
+
+		public void reset() {
+			super.reset();
+			last_flight = -1;
+		}
+
 		public Flight (GridBagLayout layout, int x) {
 			super (layout, x, "Flight");
 		}
@@ -104,9 +172,26 @@ 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) {
+				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");
 		}
@@ -115,38 +200,91 @@ 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) {
+				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 (dBm)");
+			super (layout, x, "RSSI");
 		}
 	}
 
 	RSSI rssi;
 
+	class LastPacket extends FlightValue {
+
+		long	last_secs = -1;
+
+		void show(AltosState state, AltosListenerState listener_state) {
+			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");
+		}
+	}
+
+	LastPacket last_packet;
+
 	public void reset () {
 		call.reset();
 		serial.reset();
 		flight.reset();
 		flight_state.reset();
 		rssi.reset();
+		last_packet.reset();
 	}
 
-	public void set_font () {
+	public void font_size_changed(int font_size) {
 		call.set_font();
 		serial.set_font();
 		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 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);
+		if (!listener_state.running)
+			stop();
 	}
 
 	public int height() {
@@ -154,6 +292,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();
 
@@ -164,5 +320,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);
 	}
 }