altosui: Deal with missing state transitions in FlightStats window

[fw/altos] / altosui / AltosFlightStats.java

diff --git a/altosui/AltosFlightStats.java b/altosui/AltosFlightStats.java
index e644b0bab73db07b6fd45bad7fc406f6ee1f6750..72d12600f088b918ebb4f1d8aafe6cefd01afba8 100644 (file)
--- a/altosui/AltosFlightStats.java
+++ b/altosui/AltosFlightStats.java
@@ -38,26 +38,46 @@ public class AltosFlightStats {
        int[]           state_count = new int[Altos.ao_flight_invalid + 1];
        double[]        state_start = new double[Altos.ao_flight_invalid + 1];
        double[]        state_end = new double[Altos.ao_flight_invalid + 1];
+       int             serial;
+       int             flight;
+       int             year, month, day;
+       int             hour, minute, second;
 
        public AltosFlightStats(AltosFlightReader reader) throws InterruptedException, IOException {
                AltosState      state = null;
                AltosState      new_state = null;
                double          boost_time = -1;
-               double          start_time;
+               double          end_time = 0;
 
+               year = month = day = -1;
+               hour = minute = second = -1;
+               serial = flight = -1;
                for (;;) {
                        try {
                                AltosRecord     record = reader.read();
                                if (record == null)
                                        break;
+                               if (serial < 0)
+                                       serial = record.serial;
+                               if ((record.seen & AltosRecord.seen_flight) != 0 && flight < 0)
+                                       flight = record.flight;
                                new_state = new AltosState(record, state);
-                               if (state == null) {
-                                       start_time = new_state.time;
-                               }
+                               end_time = new_state.time;
                                state = new_state;
                                if (0 <= state.state && state.state < Altos.ao_flight_invalid) {
-                                       if (boost_time == -1 && state.state >= Altos.ao_flight_boost)
-                                               boost_time = state.time;
+                                       if (state.state >= Altos.ao_flight_boost) {
+                                               if (boost_time == -1)
+                                                       boost_time = state.time;
+                                               if (state.gps != null && state.gps.locked &&
+                                                   year < 0) {
+                                                       year = state.gps.year;
+                                                       month = state.gps.month;
+                                                       day = state.gps.day;
+                                                       hour = state.gps.hour;
+                                                       minute = state.gps.minute;
+                                                       second = state.gps.second;
+                                               }
+                                       }
                                        state_accel[state.state] += state.acceleration;
                                        state_speed[state.state] += state.speed;
                                        state_baro_speed[state.state] += state.baro_speed;
@@ -67,7 +87,10 @@ public class AltosFlightStats {
                                        if (state_end[state.state] < state.time)
                                                state_end[state.state] = state.time;
                                        max_height = state.max_height;
-                                       max_speed = state.max_speed;
+                                       if (state.max_speed != 0)
+                                               max_speed = state.max_speed;
+                                       else
+                                               max_speed = state.max_baro_speed;
                                        max_acceleration = state.max_acceleration;
                                }
                        } catch (ParseException pp) {
@@ -82,6 +105,10 @@ public class AltosFlightStats {
                                state_baro_speed[s] /= state_count[s];
                                state_accel[s] /= state_count[s];
                        }
+                       if (state_start[s] == 0)
+                               state_start[s] = end_time;
+                       if (state_end[s] == 0)
+                               state_end[s] = end_time;
                }
        }