altosui: Complete split out of separate java library

[fw/altos] / altosui / AltosDescent.java

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index addd687810e4622352df37c3ad987a70b6791a69..664c5ea662ec1439d58cada5a60336325f7a844c 100644 (file)
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -27,6 +27,7 @@ import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
+import org.altusmetrum.AltosLib.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -55,6 +56,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        lights.set(false);
                }
 
+               void set_font() {
+                       label.setFont(Altos.label_font);
+                       value.setFont(Altos.value_font);
+               }
+
                public DescentStatus (GridBagLayout layout, int y, String text) {
                        GridBagConstraints      c = new GridBagConstraints();
                        c.weighty = 1;
@@ -121,6 +127,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        value.setText(v);
                }
 
+               void set_font() {
+                       label.setFont(Altos.label_font);
+                       value.setFont(Altos.value_font);
+               }
+
                public DescentValue (GridBagLayout layout, int x, int y, String text) {
                        GridBagConstraints      c = new GridBagConstraints();
                        c.weighty = 1;
@@ -169,6 +180,12 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        value2.setVisible(false);
                }
 
+               void set_font() {
+                       label.setFont(Altos.label_font);
+                       value1.setFont(Altos.value_font);
+                       value2.setFont(Altos.value_font);
+               }
+
                abstract void show(AltosState state, int crc_errors);
 
                void show(String v1, String v2) {
@@ -258,7 +275,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Lat extends DescentValue {
                void show (AltosState state, int crc_errors) {
-                       if (state.gps != null)
+                       if (state.gps != null && state.gps.connected)
                                show(pos(state.gps.lat,"N", "S"));
                        else
                                show("???");
@@ -272,7 +289,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Lon extends DescentValue {
                void show (AltosState state, int crc_errors) {
-                       if (state.gps != null)
+                       if (state.gps != null && state.gps.connected)
                                show(pos(state.gps.lon,"W", "E"));
                        else
                                show("???");
@@ -286,6 +303,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Apogee extends DescentStatus {
                void show (AltosState state, int crc_errors) {
+                       show();
                        value.setText(String.format("%4.2f V", state.drogue_sense));
                        lights.set(state.drogue_sense > 3.2);
                }
@@ -360,10 +378,22 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                apogee.reset();
        }
 
+       public void set_font() {
+               lat.set_font();
+               lon.set_font();
+               height.set_font();
+               speed.set_font();
+               bearing.set_font();
+               range.set_font();
+               elevation.set_font();
+               main.set_font();
+               apogee.set_font();
+       }
+
        public void show(AltosState state, int crc_errors) {
                height.show(state, crc_errors);
                speed.show(state, crc_errors);
-               if (state.gps != null) {
+               if (state.gps != null && state.gps.connected) {
                        bearing.show(state, crc_errors);
                        range.show(state, crc_errors);
                        elevation.show(state, crc_errors);
@@ -376,8 +406,14 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        lat.hide();
                        lon.hide();
                }
-               main.show(state, crc_errors);
-               apogee.show(state, crc_errors);
+               if (state.main_sense != AltosRecord.MISSING)
+                       main.show(state, crc_errors);
+               else
+                       main.hide();
+               if (state.drogue_sense != AltosRecord.MISSING)
+                       apogee.show(state, crc_errors);
+               else
+                       apogee.hide();
        }
 
        public AltosDescent() {