altoslib: Move computed state from AltosRecord to AltosState

[fw/altos] / altosui / AltosDescent.java

diff --git a/altosui/AltosDescent.java b/altosui/AltosDescent.java
index 2fe7d5443cb554a981aa58a0a490bf8d59ed936a..2ea7cbfa7058a219e0d8e8a5b4e7d999bc051e78 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 {
@@ -264,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);
@@ -317,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) {