altosui: Show over-ground-distance in Descent tab

[fw/altos] / altosui / AltosDescent.java

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 594a7a09bb68cc71e9fd025b93134439fb434e94..2fe7d5443cb554a981aa58a0a490bf8d59ed936a 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;
@@ -39,15 +40,24 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                abstract void show(AltosState state, int crc_errors);
 
                void show() {
-                       label.show();
-                       value.show();
-                       lights.show();
+                       label.setVisible(true);
+                       value.setVisible(true);
+                       lights.setVisible(true);
+               }
+
+               void show(String s) {
+                       show();
+                       value.setText(s);
+               }
+
+               void show(String format, double value) {
+                       show(String.format(format, value));
                }
 
                void hide() {
-                       label.hide();
-                       value.hide();
-                       lights.hide();
+                       label.setVisible(false);
+                       value.setVisible(false);
+                       lights.setVisible(false);
                }
 
                void reset() {
@@ -55,6 +65,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;
@@ -104,21 +119,31 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                abstract void show(AltosState state, int crc_errors);
 
                void show() {
-                       label.show();
-                       value.show();
+                       label.setVisible(true);
+                       value.setVisible(true);
                }
 
                void hide() {
-                       label.hide();
-                       value.hide();
+                       label.setVisible(false);
+                       value.setVisible(false);
+               }
+
+               void show(String v) {
+                       show();
+                       value.setText(v);
+               }
+
+               void show(AltosUnits units, double v) {
+                       show(units.show(8, v));
                }
 
                void show(String format, double v) {
-                       value.setText(String.format(format, v));
+                       show(String.format(format, v));
                }
 
-               void show(String v) {
-                       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) {
@@ -158,15 +183,21 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                }
 
                void show() {
-                       label.show();
-                       value1.show();
-                       value2.show();
+                       label.setVisible(true);
+                       value1.setVisible(true);
+                       value2.setVisible(true);
                }
 
                void hide() {
-                       label.hide();
-                       value1.hide();
-                       value2.hide();
+                       label.setVisible(false);
+                       value1.setVisible(false);
+                       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);
@@ -222,7 +253,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Height extends DescentValue {
                void show (AltosState state, int crc_errors) {
-                       show("%6.0f m", state.height);
+                       show(AltosConvert.height, state.height);
                }
                public Height (GridBagLayout layout, int x, int y) {
                        super (layout, x, y, "Height");
@@ -236,7 +267,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        double speed = state.speed;
                        if (!state.ascent)
                                speed = state.baro_speed;
-                       show("%6.0f m/s", speed);
+                       show(AltosConvert.speed, speed);
                }
                public Speed (GridBagLayout layout, int x, int y) {
                        super (layout, x, y, "Speed");
@@ -258,7 +289,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 +303,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("???");
@@ -284,9 +315,22 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        Lon lon;
 
+       class Distance extends DescentValue {
+               void show(AltosState state, int crc_errors) {
+                       show(AltosConvert.distance, state.from_pad.distance);
+               }
+
+               public Distance (GridBagLayout layout, int x, int y) {
+                       super(layout, x, y, "Ground Distance");
+               }
+       }
+
+       Distance distance;
+               
+
        class Apogee extends DescentStatus {
                void show (AltosState state, int crc_errors) {
-                       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) {
@@ -298,8 +342,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Main extends DescentStatus {
                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) {
@@ -328,7 +371,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Range extends DescentValue {
                void show (AltosState state, int crc_errors) {
-                       show("%6.0f m", state.range);
+                       show(AltosConvert.distance, state.range);
                }
                public Range (GridBagLayout layout, int x, int y) {
                        super (layout, x, y, "Range");
@@ -355,29 +398,51 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                speed.reset();
                bearing.reset();
                range.reset();
+               distance.reset();
                elevation.reset();
                main.reset();
                apogee.reset();
        }
 
+       public void set_font() {
+               lat.set_font();
+               lon.set_font();
+               height.set_font();
+               speed.set_font();
+               bearing.set_font();
+               range.set_font();
+               distance.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);
+                       distance.show(state, crc_errors);
                        elevation.show(state, crc_errors);
                        lat.show(state, crc_errors);
                        lon.show(state, crc_errors);
                } else {
                        bearing.hide();
                        range.hide();
+                       distance.hide();
                        elevation.hide();
                        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() {
@@ -391,10 +456,11 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                elevation = new Elevation(layout, 0, 1);
                range = new Range(layout, 2, 1);
                bearing = new Bearing(layout, 0, 2);
-               lat = new Lat(layout, 0, 3);
-               lon = new Lon(layout, 2, 3);
+               distance = new Distance(layout, 0, 3);
+               lat = new Lat(layout, 0, 4);
+               lon = new Lon(layout, 2, 4);
 
-               apogee = new Apogee(layout, 4);
-               main = new Main(layout, 5);
+               apogee = new Apogee(layout, 5);
+               main = new Main(layout, 6);
        }
 }