Merge branch 'master' of ssh://git.gag.com/scm/git/fw/altos

[fw/altos] / telegps / TeleGPSStatus.java

diff --git a/telegps/TeleGPSStatus.java b/telegps/TeleGPSStatus.java
index fd66b279fddc87609c1a998cfea44d8c8d0d07e9..1d4415d6064d400444891ea769c3a0643a3ac0ea 100644 (file)
--- a/telegps/TeleGPSStatus.java
+++ b/telegps/TeleGPSStatus.java
@@ -19,13 +19,13 @@ package org.altusmetrum.telegps;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_5.*;
+import org.altusmetrum.altosuilib_3.*;
 
 public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
 
-       public class FlightValue {
+       public class Value {
                JLabel          label;
                JTextField      value;
 
@@ -45,7 +45,7 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                        value.setVisible(visible);
                }
 
-               public FlightValue (GridBagLayout layout, int x, String text) {
+               public Value (GridBagLayout layout, int x, String text) {
                        GridBagConstraints      c = new GridBagConstraints();
                        c.insets = new Insets(5, 5, 5, 5);
                        c.anchor = GridBagConstraints.CENTER;
@@ -61,6 +61,7 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                        add(label);
 
                        value = new JTextField("");
+                       value.setEditable(false);
                        value.setFont(AltosUILib.status_font);
                        value.setHorizontalAlignment(SwingConstants.CENTER);
                        c.gridx = x; c.gridy = 1;
@@ -69,14 +70,25 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                }
        }
 
-       class Call extends FlightValue {
+       class Call extends Value {
+               String  call;
+
                void show(AltosState state, AltosListenerState listener_state) {
-                       value.setText(state.callsign);
+                       if (state.callsign != call) {
+                               value.setText(state.callsign);
+                               call = state.callsign;
+                       }
                        if (state.callsign == null)
                                setVisible(false);
                        else
                                setVisible(true);
                }
+
+               public void reset() {
+                       super.reset();
+                       call = "";
+               }
+
                public Call (GridBagLayout layout, int x) {
                        super (layout, x, "Callsign");
                }
@@ -84,13 +96,23 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
        Call call;
 
-       class Serial extends FlightValue {
+       class Serial extends Value {
+               int     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 != serial) {
+                               if (state.serial == AltosLib.MISSING)
+                                       value.setText("none");
+                               else
+                                       value.setText(String.format("%d", state.serial));
+                               serial = state.serial;
+                       }
                }
+
+               public void reset() {
+                       super.reset();
+                       serial = -1;
+               }
+
                public Serial (GridBagLayout layout, int x) {
                        super (layout, x, "Serial");
                }
@@ -98,14 +120,53 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
        Serial serial;
 
-       class RSSI extends FlightValue {
+       class Flight extends Value {
+
+               int     last_flight = -1;
+
                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.flight != last_flight) {
+                               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");
+               }
+       }
+
+       Flight flight;
+
+       class RSSI extends Value {
+               int     rssi = 10000;
+
+               void show(AltosState state, AltosListenerState listener_state) {
+                       int     new_rssi = state.rssi();
+
+                       if (new_rssi != rssi) {
+                               value.setText(String.format("%d", new_rssi));
+                               if (state.rssi == AltosLib.MISSING)
+                                       setVisible(false);
+                               else
+                                       setVisible(true);
+                               rssi = new_rssi;
+                       }
+               }
+
+               public void reset() {
+                       super.reset();
+                       rssi = 10000;
                }
+
                public RSSI (GridBagLayout layout, int x) {
                        super (layout, x, "RSSI");
                }
@@ -113,11 +174,28 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
        RSSI rssi;
 
-       class LastPacket extends FlightValue {
+       class LastPacket extends Value {
+
+               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 (secs != last_secs) {
+                               value.setText(String.format("%d", secs));
+                               last_secs = secs;
+                       }
+               }
+
+               void reset() {
+                       super.reset();
+                       last_secs = -1;
+               }
+
+               void disable() {
+                       value.setText("");
                }
+
                public LastPacket(GridBagLayout layout, int x) {
                        super (layout, x, "Age");
                }
@@ -125,23 +203,33 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
        LastPacket last_packet;
 
+       public void disable_receive() {
+               last_packet.disable();
+       }
+
        public void reset () {
                call.reset();
                serial.reset();
+               flight.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();
                rssi.set_font();
                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);
+               flight.show(state, listener_state);
                rssi.show(state, listener_state);
                last_packet.show(state, listener_state);
        }
@@ -158,6 +246,7 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
                call = new Call(layout, 0);
                serial = new Serial(layout, 1);
+               flight = new Flight(layout, 2);
                rssi = new RSSI(layout, 4);
                last_packet = new LastPacket(layout, 5);
        }