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

diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index b27deba9..207c44b4 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
@@ -19,17 +20,27 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
 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("");
@@ -82,15 +93,22 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		}
 
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (!same_call(state.callsign)) {
-				value.setText(state.callsign);
-				if (state.callsign == null)
+			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.callsign;
+				last_call = state.cal_data().callsign;
 			}
 		}
+
+		public void reset() {
+			super.reset();
+			last_call = "";
+		}
+
 		public Call (GridBagLayout layout, int x) {
 			super (layout, x, "Callsign");
 		}
@@ -102,14 +120,22 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 
 		int	last_serial = -1;
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.serial != last_serial) {
-				if (state.serial == AltosLib.MISSING)
+			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", state.serial));
-				last_serial = state.serial;
+					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");
 		}
@@ -122,14 +148,22 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		int	last_flight = -1;
 
 		void show(AltosState state, AltosListenerState listener_state) {
-			if (state.flight != last_flight) {
-				if (state.flight == AltosLib.MISSING)
+			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", state.flight));
-				last_flight = state.flight;
+					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");
 		}
@@ -142,11 +176,22 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		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;
+			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");
 		}
@@ -160,6 +205,7 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 
 		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);
@@ -168,6 +214,12 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 				last_rssi = state.rssi();
 			}
 		}
+
+		public void reset() {
+			super.reset();
+			last_rssi = 10000;
+		}
+
 		public RSSI (GridBagLayout layout, int x) {
 			super (layout, x, "RSSI");
 		}
@@ -180,12 +232,22 @@ public class AltosFlightStatus extends JComponent implements AltosFlightDisplay
 		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;
+			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");
 		}
@@ -221,6 +283,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() {
@@ -228,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();