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 0be7bb51b811b9fdcec6d0d89beee9c454622f3f..b27deba903a589af3c3b86cb29c23920ed886083 100644 (file)
--- a/altosui/AltosFlightStatus.java
+++ b/altosui/AltosFlightStatus.java
@@ -19,7 +19,8 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_1.*;
+import org.altusmetrum.altoslib_4.*;
+import org.altusmetrum.altosuilib_2.*;
 
 public class AltosFlightStatus extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -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 {
+
+               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) {
-                       value.setText(state.callsign);
+                       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,11 +99,16 @@ 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 == AltosRecord.MISSING)
-                               value.setText("none");
-                       else
-                               value.setText(String.format("%d", state.serial));
+                       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");
@@ -89,11 +118,17 @@ 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 == AltosRecord.MISSING)
-                               value.setText("none");
-                       else
-                               value.setText(String.format("%d", state.flight));
+                       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");
@@ -103,8 +138,14 @@ 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) {
+                               value.setText(state.state_name());
+                               last_state = state.state;
+                       }
                }
                public FlightState (GridBagLayout layout, int x) {
                        super (layout, x, "State");
@@ -114,8 +155,18 @@ 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() != 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");
@@ -125,9 +176,15 @@ 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.report_time + 500) / 1000;
-                       value.setText(String.format("%d", secs));
+                       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");
@@ -145,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();
@@ -154,6 +211,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);