altosui: Display current GPS in 'pad' tab for 'startup' staten

[fw/altos] / altosui / AltosPad.java

diff --git a/altosui/AltosPad.java b/altosui/AltosPad.java
index 8006190d66889ae9697ae1de74477bed1c395e76..eb08525cff68775ef462eebf7e9ebe4c43c7b1fc 100644 (file)
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -15,19 +15,11 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package AltosUI;
+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.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosPad extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -38,6 +30,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                AltosLights     lights;
 
                void show(AltosState state, int crc_errors) {}
+
                void reset() {
                        value.setText("");
                        lights.set(false);
@@ -49,6 +42,19 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                        lights.setVisible(true);
                }
 
+               void show(String s) {
+                       show();
+                       value.setText(s);
+               }
+
+               void show(String format, double value) {
+                       show(String.format(format, value));
+               }
+
+               void show(String format, int value) {
+                       show(String.format(format, value));
+               }
+
                public void hide() {
                        label.setVisible(false);
                        value.setVisible(false);
@@ -60,6 +66,10 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                        value.setFont(Altos.value_font);
                }
 
+               public void set_label(String text) {
+                       label.setText(text);
+               }
+               
                public LaunchStatus (GridBagLayout layout, int y, String text) {
                        GridBagConstraints      c = new GridBagConstraints();
                        c.weighty = 1;
@@ -116,9 +126,27 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                        value.setFont(Altos.value_font);
                }
 
+               void show(String s) {
+                       show();
+                       value.setText(s);
+               }
+
+               void show(AltosUnits units, double v) {
+                       show(units.show(8, v));
+               }
+
+               void show(String format, double v) {
+                       show(String.format(format, v));
+               }
+
+               public void set_label(String text) {
+                       label.setText(text);
+               }
+               
                void reset() {
                        value.setText("");
                }
+
                public LaunchValue (GridBagLayout layout, int y, String text) {
                        GridBagConstraints      c = new GridBagConstraints();
                        c.insets = new Insets(Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad, Altos.tab_elt_pad);
@@ -148,8 +176,12 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class Battery extends LaunchStatus {
                void show (AltosState state, int crc_errors) {
-                       value.setText(String.format("%4.2f V", state.battery));
-                       lights.set(state.battery > 3.7);
+                       if (state.battery == AltosRecord.MISSING)
+                               hide();
+                       else {
+                               show("%4.2f V", state.battery);
+                               lights.set(state.battery > 3.7);
+                       }
                }
                public Battery (GridBagLayout layout, int y) {
                        super(layout, y, "Battery Voltage");
@@ -160,8 +192,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class Apogee extends LaunchStatus {
                void show (AltosState state, int crc_errors) {
-                       show();
-                       value.setText(String.format("%4.2f V", state.drogue_sense));
+                       show("%4.2f V", state.drogue_sense);
                        lights.set(state.drogue_sense > 3.2);
                }
                public Apogee (GridBagLayout layout, int y) {
@@ -173,8 +204,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class Main extends LaunchStatus {
                void show (AltosState state, int crc_errors) {
-                       show();
-                       value.setText(String.format("%4.2f V", state.main_sense));
+                       show("%4.2f V", state.main_sense);
                        lights.set(state.main_sense > 3.2);
                }
                public Main (GridBagLayout layout, int y) {
@@ -186,17 +216,16 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class LoggingReady extends LaunchStatus {
                void show (AltosState state, int crc_errors) {
-                       show();
                        if (state.data.flight != 0) {
                                if (state.data.state <= Altos.ao_flight_pad)
-                                       value.setText("Ready to record");
+                                       show("Ready to record");
                                else if (state.data.state < Altos.ao_flight_landed)
-                                       value.setText("Recording data");
+                                       show("Recording data");
                                else
-                                       value.setText("Recorded data");
+                                       show("Recorded data");
                        }
                        else
-                               value.setText("Storage full");
+                               show("Storage full");
                        lights.set(state.data.flight != 0);
                }
                public LoggingReady (GridBagLayout layout, int y) {
@@ -208,8 +237,7 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class GPSLocked extends LaunchStatus {
                void show (AltosState state, int crc_errors) {
-                       show();
-                       value.setText(String.format("%4d sats", state.gps.nsat));
+                       show("%4d sats", state.gps.nsat);
                        lights.set(state.gps.locked && state.gps.nsat >= 4);
                }
                public GPSLocked (GridBagLayout layout, int y) {
@@ -221,11 +249,10 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class GPSReady extends LaunchStatus {
                void show (AltosState state, int crc_errors) {
-                       show();
                        if (state.gps_ready)
-                               value.setText("Ready");
+                               show("Ready");
                        else
-                               value.setText(String.format("Waiting %d", state.gps_waiting));
+                               show("Waiting %d", state.gps_waiting);
                        lights.set(state.gps_ready);
                }
                public GPSReady (GridBagLayout layout, int y) {
@@ -248,8 +275,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class PadLat extends LaunchValue {
                void show (AltosState state, int crc_errors) {
-                       show();
-                       value.setText(pos(state.pad_lat,"N", "S"));
+                       if (state.state < AltosLib.ao_flight_pad && state.gps != null) {
+                               show(pos(state.gps.lat,"N", "S"));
+                               set_label("Latitude");
+                       } else { 
+                               show(pos(state.pad_lat,"N", "S"));
+                               set_label("Pad Latitude");
+                       }
                }
                public PadLat (GridBagLayout layout, int y) {
                        super (layout, y, "Pad Latitude");
@@ -260,8 +292,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class PadLon extends LaunchValue {
                void show (AltosState state, int crc_errors) {
-                       show();
-                       value.setText(pos(state.pad_lon,"E", "W"));
+                       if (state.state < AltosLib.ao_flight_pad && state.gps != null) {
+                               show(pos(state.gps.lon,"E", "W"));
+                               set_label("Longitude");
+                       } else { 
+                               show(pos(state.pad_lon,"E", "W"));
+                               set_label("Pad Longitude");
+                       }
                }
                public PadLon (GridBagLayout layout, int y) {
                        super (layout, y, "Pad Longitude");
@@ -272,7 +309,17 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class PadAlt extends LaunchValue {
                void show (AltosState state, int crc_errors) {
-                       value.setText(String.format("%4.0f m", state.pad_alt));
+                       if (state.state < AltosLib.ao_flight_pad && state.gps != null) {
+                               show("%4.0f m", state.gps.alt);
+                               set_label("Altitude");
+                       } else {
+                               if (state.pad_alt == AltosRecord.MISSING)
+                                       hide();
+                               else {
+                                       show("%4.0f m", state.pad_alt);
+                                       set_label("Pad Altitude");
+                               }
+                       }
                }
                public PadAlt (GridBagLayout layout, int y) {
                        super (layout, y, "Pad Altitude");