altoslib: Move computed state from AltosRecord to AltosState

[fw/altos] / altosui / AltosAscent.java

diff --git a/altosui/AltosAscent.java b/altosui/AltosAscent.java
index 3fe517aa6bb08388aeef0874e11ff2577dac8e89..a05c44041ba2a91a4b681c9ceb3b7ad3080265b7 100644 (file)
--- a/altosui/AltosAscent.java
+++ b/altosui/AltosAscent.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 AltosAscent extends JComponent implements AltosFlightDisplay {
@@ -259,7 +251,7 @@ public class AltosAscent extends JComponent implements AltosFlightDisplay {
 
        class Speed extends AscentValueHold {
                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);