altosui: Adapt to flight stats time value changes

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index ac121512c3a544eef1b8a9429ee7a0211bf61393..a5a2078da0a11ac3283c1cc33f4feafc17f98d83 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -23,8 +23,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_11.*;
-import org.altusmetrum.altosuilib_11.*;
+import org.altusmetrum.altoslib_12.*;
+import org.altusmetrum.altosuilib_12.*;
 
 public class AltosUI extends AltosUIFrame {
        public AltosVoice voice = new AltosVoice();
@@ -342,7 +342,7 @@ public class AltosUI extends AltosUIFrame {
                if (set == null)
                        return;
                AltosFlightSeries series = make_series(set);
-               new AltosCSVUI(AltosUI.this, series, series.cal_data, chooser.file());
+               new AltosCSVUI(AltosUI.this, series, chooser.file());
        }
 
        /* Load a flight log CSV file and display a pretty graph.
@@ -520,11 +520,12 @@ public class AltosUI extends AltosUIFrame {
                        System.out.printf("Main rate:   %6.0f m/s  %6.0f ft/s\n",
                                          stats.state_speed[Altos.ao_flight_main],
                                          AltosConvert.meters_to_feet(stats.state_speed[Altos.ao_flight_main]));
-               if (stats.state_end[Altos.ao_flight_main] != AltosLib.MISSING &&
-                   stats.state_start[Altos.ao_flight_boost] != AltosLib.MISSING)
+               if (stats.landed_time != AltosLib.MISSING &&
+                   stats.boost_time != AltosLib.MISSING &&
+                   stats.landed_time > stats.boost_time)
                        System.out.printf("Flight time: %6.0f s\n",
-                                         stats.state_end[Altos.ao_flight_main] -
-                                         stats.state_start[Altos.ao_flight_boost]);
+                                         stats.landed_time -
+                                         stats.boost_time);
                System.out.printf("\n");
                return true;
        }