altosui/telegps: Reduce CPU time needed for flight displays

[fw/altos] / altosui / AltosFlightStatus.java

diff --git a/altosui/AltosFlightStatus.java b/altosui/AltosFlightStatus.java
index ed27338432564682dcfa327a8e11abc5a044edff..b27deba903a589af3c3b86cb29c23920ed886083 100644 (file)
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -18,15 +18,9 @@
 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_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -35,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("");
@@ -46,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);
@@ -62,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;
@@ -71,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");
@@ -82,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");
@@ -93,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");
@@ -104,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");
@@ -115,38 +155,72 @@ 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 (dBm)");
+                       super (layout, x, "RSSI");
                }
        }
 
        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;
+                       if (secs != last_secs) {
+                               value.setText(String.format("%d", secs));
+                               last_secs = 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 () {
+       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 units_changed(boolean imperial_units) {
        }
 
-       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 +238,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);
        }
 }