altosui: Hide flight-related tabs for telegps

[fw/altos] / altosui / AltosDescent.java

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index e9ff590b735e6d79dbec25187ad421426bd9f8f0..9838f46b722f07d3c416e7ce7c82d75b72f8f6ee 100644 (file)
--- a/altosui/AltosDescent.java
+++ b/altosui/AltosDescent.java
@@ -19,7 +19,7 @@ package altosui;
 
 import java.awt.*;
 import javax.swing.*;
-import org.altusmetrum.AltosLib.*;
+import org.altusmetrum.altoslib_1.*;
 
 public class AltosDescent extends JComponent implements AltosFlightDisplay {
        GridBagLayout   layout;
@@ -256,7 +256,7 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Speed extends DescentValue {
                void show (AltosState state, int crc_errors) {
-                       double speed = state.speed;
+                       double speed = state.accel_speed;
                        if (!state.ascent)
                                speed = state.baro_speed;
                        show(AltosConvert.speed, speed);
@@ -309,7 +309,10 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
 
        class Distance extends DescentValue {
                void show(AltosState state, int crc_errors) {
-                       show(AltosConvert.distance, state.from_pad.distance);
+                       if (state.from_pad != null)
+                               show(AltosConvert.distance, state.from_pad.distance);
+                       else
+                               show("???");
                }
 
                public Distance (GridBagLayout layout, int x, int y) {
@@ -437,6 +440,10 @@ public class AltosDescent extends JComponent implements AltosFlightDisplay {
                        apogee.hide();
        }
 
+       public String getName() {
+               return "Descent";
+       }
+
        public AltosDescent() {
                layout = new GridBagLayout();