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 947c754080f7a7499f099c321fda0c3b918c9f16..eb08525cff68775ef462eebf7e9ebe4c43c7b1fc 100644 (file)
--- a/altosui/AltosPad.java
+++ b/altosui/AltosPad.java
@@ -18,16 +18,8 @@
 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;
@@ -74,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;
@@ -143,6 +139,10 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
                        show(String.format(format, v));
                }
 
+               public void set_label(String text) {
+                       label.setText(text);
+               }
+               
                void reset() {
                        value.setText("");
                }
@@ -176,8 +176,12 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class Battery extends LaunchStatus {
                void show (AltosState state, int crc_errors) {
-                       show("%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");
@@ -271,7 +275,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class PadLat extends LaunchValue {
                void show (AltosState state, int crc_errors) {
-                       show(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");
@@ -282,7 +292,13 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class PadLon extends LaunchValue {
                void show (AltosState state, int crc_errors) {
-                       show(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");
@@ -293,7 +309,17 @@ public class AltosPad extends JComponent implements AltosFlightDisplay {
 
        class PadAlt extends LaunchValue {
                void show (AltosState state, int crc_errors) {
-                       show("%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");