altosui: Handle missing pad distance in descent tab

[fw/altos] / altosui / AltosDescent.java

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 73972b865dfcb6a66eb493441bc966e7019abaf7..a71cdc10c0fc97f2305951365294cc165f1d3580 100644 (file)
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -18,15 +18,7 @@
 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.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
@@ -315,6 +307,22 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        Lon lon;
 
+       class Distance extends DescentValue {
+               void show(AltosState state, int crc_errors) {
+                       if (state.from_pad != null)
+                               show(AltosConvert.distance, state.from_pad.distance);
+                       else
+                               show("???");
+               }
+
+               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) {
                        show("%4.2f V", state.drogue_sense);
@@ -385,6 +393,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                speed.reset();
                bearing.reset();
                range.reset();
+               distance.reset();
                elevation.reset();
                main.reset();
                apogee.reset();
@@ -397,6 +406,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                speed.set_font();
                bearing.set_font();
                range.set_font();
+               distance.set_font();
                elevation.set_font();
                main.set_font();
                apogee.set_font();
@@ -408,12 +418,14 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                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();
@@ -439,10 +451,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);
        }
 }