Bump java lib versions in preparation for 1.9.2

[fw/altos] / telegps / TeleGPSStatus.java

diff --git a/telegps/TeleGPSStatus.java b/telegps/TeleGPSStatus.java
index e6bb1ea58a7bb047836aa99857f41fca895aa738..d29774bb0973ba5a09cd0046064e54425d43e164 100644 (file)
--- a/telegps/TeleGPSStatus.java
+++ b/telegps/TeleGPSStatus.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,8 +20,8 @@ package org.altusmetrum.telegps;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.altoslib_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_14.*;
+import org.altusmetrum.altosuilib_14.*;
 
 public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -74,15 +75,24 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                String  call;
 
                void show(AltosState state, AltosListenerState listener_state) {
-                       if (state.callsign != call) {
-                               value.setText(state.callsign);
-                               call = state.callsign;
+                       AltosCalData cal_data = state.cal_data();
+                       if (cal_data == null)
+                               System.out.printf("null cal data?\n");
+                       if (cal_data.callsign != call) {
+                               value.setText(cal_data.callsign);
+                               call = cal_data.callsign;
                        }
-                       if (state.callsign == null)
+                       if (cal_data.callsign == null)
                                setVisible(false);
                        else
                                setVisible(true);
                }
+
+               public void reset() {
+                       super.reset();
+                       call = "";
+               }
+
                public Call (GridBagLayout layout, int x) {
                        super (layout, x, "Callsign");
                }
@@ -93,14 +103,21 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
        class Serial extends Value {
                int     serial = -1;
                void show(AltosState state, AltosListenerState listener_state) {
-                       if (state.serial != serial) {
-                               if (state.serial == AltosLib.MISSING)
+                       AltosCalData cal_data = state.cal_data();
+                       if (cal_data.serial != serial) {
+                               if (cal_data.serial == AltosLib.MISSING)
                                        value.setText("none");
                                else
-                                       value.setText(String.format("%d", state.serial));
-                               serial = state.serial;
+                                       value.setText(String.format("%d", cal_data.serial));
+                               serial = cal_data.serial;
                        }
                }
+
+               public void reset() {
+                       super.reset();
+                       serial = -1;
+               }
+
                public Serial (GridBagLayout layout, int x) {
                        super (layout, x, "Serial");
                }
@@ -108,6 +125,33 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
 
        Serial serial;
 
+       class Flight extends Value {
+
+               int     last_flight = -1;
+
+               void show(AltosState state, AltosListenerState listener_state) {
+                       AltosCalData cal_data = state.cal_data();
+                       if (cal_data.flight != last_flight) {
+                               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");
+               }
+       }
+
+       Flight flight;
+
        class RSSI extends Value {
                int     rssi = 10000;
 
@@ -123,6 +167,12 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                                rssi = new_rssi;
                        }
                }
+
+               public void reset() {
+                       super.reset();
+                       rssi = 10000;
+               }
+
                public RSSI (GridBagLayout layout, int x) {
                        super (layout, x, "RSSI");
                }
@@ -135,13 +185,27 @@ public class TeleGPSStatus 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");
                        }
                }
+
+               void reset() {
+                       super.reset();
+                       last_secs = -1;
+               }
+
+               void disable() {
+                       value.setText("");
+               }
+
                public LastPacket(GridBagLayout layout, int x) {
                        super (layout, x, "Age");
                }
@@ -149,9 +213,14 @@ 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();
        }
@@ -159,6 +228,7 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
        public void font_size_changed(int font_size) {
                call.set_font();
                serial.set_font();
+               flight.set_font();
                rssi.set_font();
                last_packet.set_font();
        }
@@ -169,8 +239,11 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
        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);
+               if (!listener_state.running)
+                       stop();
        }
 
        public int height() {
@@ -178,6 +251,22 @@ public class TeleGPSStatus extends JComponent implements AltosFlightDisplay {
                return d.height;
        }
 
+       TeleGPSStatusUpdate     status_update;
+       javax.swing.Timer       timer;
+
+       public void start(TeleGPSStatusUpdate 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 TeleGPSStatus() {
                layout = new GridBagLayout();
 
@@ -185,6 +274,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);
        }