altoslib: Make sure AltosFlightSeries is filled in before use

After all of the raw data is captured, the derived data needs to be
computed by calling the 'finish' function.

Signed-off-by: Keith Packard <keithp@keithp.com>

diff --git a/altoslib/AltosCSV.java b/altoslib/AltosCSV.java
index 38afdc640e4d85df23a144c497b257ab97477d89..5117a702d35bc25bb765b271d68801c7930ea2c6 100644 (file)
--- a/altoslib/AltosCSV.java
+++ b/altoslib/AltosCSV.java
@@ -393,7 +393,7 @@ public class AltosCSV implements AltosWriter {
 
                this.series = series;
 
 
                this.series = series;
 

-               series.fill_in();
+               series.finish();

 
                has_flight_state = false;
                has_basic = false;
 
                has_flight_state = false;
                has_basic = false;

diff --git a/altoslib/AltosDataListener.java b/altoslib/AltosDataListener.java
index 4a6fe04de279c0f3bc98c14f83301a422edb6683..14c29d85263fc332e2ebe29f8be7bf6a22f121ec 100644 (file)
--- a/altoslib/AltosDataListener.java
+++ b/altoslib/AltosDataListener.java
@@ -36,6 +36,10 @@ public abstract class AltosDataListener {
                        this.state = state;
        }
 
                        this.state = state;
        }
 

+       /* Called after all records are captured */
+       public void finish() {
+       }
+

        public abstract void set_rssi(int rssi, int status);
        public abstract void set_received_time(long received_time);
 
        public abstract void set_rssi(int rssi, int status);
        public abstract void set_received_time(long received_time);
 

diff --git a/altoslib/AltosEepromRecordSet.java b/altoslib/AltosEepromRecordSet.java
index 69159cdf905a02ab7945e1394b33bf1082c0ffee..183cb9aecc0f4deca8cd269d40d01df6a8639324 100644 (file)
--- a/altoslib/AltosEepromRecordSet.java
+++ b/altoslib/AltosEepromRecordSet.java
@@ -44,6 +44,7 @@ public class AltosEepromRecordSet implements AltosRecordSet {
                for (AltosEepromRecord record : ordered) {
                        record.provide_data(listener, cal_data);
                }
                for (AltosEepromRecord record : ordered) {
                        record.provide_data(listener, cal_data);
                }

+               listener.finish();

        }
 
        public AltosEepromRecordSet(AltosEepromNew eeprom) {
        }
 
        public AltosEepromRecordSet(AltosEepromNew eeprom) {

diff --git a/altoslib/AltosFlightSeries.java b/altoslib/AltosFlightSeries.java
index 7bedf38903eeadb209cc7616220a02a049795c45..6f4f7bb1e89c5960a5744df84ca1ba49cc7c273e 100644 (file)
--- a/altoslib/AltosFlightSeries.java
+++ b/altoslib/AltosFlightSeries.java
@@ -18,7 +18,7 @@ import java.util.*;
 
 public class AltosFlightSeries extends AltosDataListener {
 
 
 public class AltosFlightSeries extends AltosDataListener {
 

-       public ArrayList<AltosTimeSeries> series;
+       public ArrayList<AltosTimeSeries> series = new ArrayList<AltosTimeSeries>();

 
        public int[] indices() {
                int[] indices = new int[series.size()];
 
        public int[] indices() {
                int[] indices = new int[series.size()];


@@ -206,8 +206,9 @@ public class AltosFlightSeries extends AltosDataListener {
                altitude_series.add(time(), altitude);
        }
 
                altitude_series.add(time(), altitude);
        }
 

-       private void compute_height(double ground_altitude) {
-               if (height_series == null) {
+       private void compute_height() {
+               double ground_altitude = cal_data.ground_altitude;
+               if (height_series == null && ground_altitude != AltosLib.MISSING) {

                        height_series = add_series(height_name, AltosConvert.height);
                        for (AltosTimeValue alt : altitude_series)
                                height_series.add(alt.time, alt.value - ground_altitude);
                        height_series = add_series(height_name, AltosConvert.height);
                        for (AltosTimeValue alt : altitude_series)
                                height_series.add(alt.time, alt.value - ground_altitude);


@@ -563,25 +564,18 @@ public class AltosFlightSeries extends AltosDataListener {
        public void set_companion(AltosCompanion companion) {
        }
 
        public void set_companion(AltosCompanion companion) {
        }
 

-       public void fill_in() {
+       public void finish() {

                compute_speed();
                compute_accel();
                compute_speed();
                compute_accel();

-               if (cal_data.ground_altitude != AltosLib.MISSING)
-                       compute_height(cal_data.ground_altitude);
-       }
-
-       public void init() {
-               time = AltosLib.MISSING;
-               series = new ArrayList<AltosTimeSeries>();
+               compute_height();

        }
 
        public AltosTimeSeries[] series() {
        }
 
        public AltosTimeSeries[] series() {

-               fill_in();
+               finish();

                return series.toArray(new AltosTimeSeries[0]);
        }
 
        public AltosFlightSeries(AltosCalData cal_data) {
                super(cal_data);
                return series.toArray(new AltosTimeSeries[0]);
        }
 
        public AltosFlightSeries(AltosCalData cal_data) {
                super(cal_data);

-               init();

        }
 }
        }
 }

diff --git a/altoslib/AltosFlightStats.java b/altoslib/AltosFlightStats.java
index 2948ad380e05801a741dae247b245250dfb25a99..32beb8b563c5c552459ec7b3ccc962af8daa9e7d 100644 (file)
--- a/altoslib/AltosFlightStats.java
+++ b/altoslib/AltosFlightStats.java
@@ -59,7 +59,7 @@ public class AltosFlightStats {
                }
 
                if (landed_state_time == AltosLib.MISSING)
                }
 
                if (landed_state_time == AltosLib.MISSING)

-                       return AltosLib.MISSING;
+                       landed_state_time = series.height_series.get(series.height_series.size()-1).time;

 
                double landed_height = AltosLib.MISSING;
                for (AltosTimeValue height : series.height_series) {
 
                double landed_height = AltosLib.MISSING;
                for (AltosTimeValue height : series.height_series) {


@@ -115,6 +115,8 @@ public class AltosFlightStats {
                double          end_time = 0;
                double          landed_time = landed_time(series);
 
                double          end_time = 0;
                double          landed_time = landed_time(series);
 

+               series.finish();
+

                year = month = day = AltosLib.MISSING;
                hour = minute = second = AltosLib.MISSING;
                serial = flight = AltosLib.MISSING;
                year = month = day = AltosLib.MISSING;
                hour = minute = second = AltosLib.MISSING;
                serial = flight = AltosLib.MISSING;


@@ -136,7 +138,7 @@ public class AltosFlightStats {
                                state_start[s] = boost_time;
                        else
                                state_start[s] = series.state_series.time_of(s);
                                state_start[s] = boost_time;
                        else
                                state_start[s] = series.state_series.time_of(s);

-                       if (s == AltosLib.ao_flight_landed)
+                       if (s == AltosLib.ao_flight_main)

                                state_end[s] = landed_time;
                        else
                                state_end[s] = series.state_series.time_of(s+1);
                                state_end[s] = landed_time;
                        else
                                state_end[s] = series.state_series.time_of(s+1);

diff --git a/altoslib/AltosTelemetryFile.java b/altoslib/AltosTelemetryFile.java
index 8adf7e695c569900ead1a3d301b547c5e0cce15a..46a5d060caf9a264335947ec26e5909aa4a251f7 100644 (file)
--- a/altoslib/AltosTelemetryFile.java
+++ b/altoslib/AltosTelemetryFile.java
@@ -124,6 +124,7 @@ public class AltosTelemetryFile implements AltosRecordSet {
                        if (cal_data.time() >= -1)
                                telem.provide_data(listener, cal_data);
                }
                        if (cal_data.time() >= -1)
                                telem.provide_data(listener, cal_data);
                }

+               listener.finish();

        }
 
        public AltosTelemetryFile(FileInputStream input) {
        }
 
        public AltosTelemetryFile(FileInputStream input) {

diff --git a/altoslib/AltosTelemetryRecordSet.java b/altoslib/AltosTelemetryRecordSet.java
index 0cb95261310f764124d1338a5b94934edb85799b..0323c25e7fcb96ca41a28fb29f597242dfdaa321 100644 (file)
--- a/altoslib/AltosTelemetryRecordSet.java
+++ b/altoslib/AltosTelemetryRecordSet.java
@@ -21,10 +21,11 @@ public class AltosTelemetryRecordSet implements AltosRecordSet {
        AltosTelemetry                  telemetry;
        TreeSet<AltosTelemetryRecord>   ordered;
 
        AltosTelemetry                  telemetry;
        TreeSet<AltosTelemetryRecord>   ordered;
 

-       public void capture_series(AltosDataListener series) {
+       public void capture_series(AltosDataListener listener) {

                for (AltosTelemetryRecord record : ordered) {
                for (AltosTelemetryRecord record : ordered) {

-                       record.update_state(series);
+                       record.update_state(listener);

                }
                }

+               listener.finish();

        }
 
        public AltosTelemetryRecordSet(AltosTelemetry telemetry) {
        }
 
        public AltosTelemetryRecordSet(AltosTelemetry telemetry) {

diff --git a/altosui/AltosGraphUI.java b/altosui/AltosGraphUI.java
index a3107f2bfc183362d773620ffe5bda82fc828148..db0cac2ffe178b60c58cfd27595893f23d49385a 100644 (file)
--- a/altosui/AltosGraphUI.java
+++ b/altosui/AltosGraphUI.java
@@ -93,7 +93,7 @@ public class AltosGraphUI extends AltosUIFrame implements AltosFontListener, Alt
 
                set.capture_series(flight_series);
 
 
                set.capture_series(flight_series);
 

-               flight_series.fill_in();
+               flight_series.finish();

 
                stats = new AltosFlightStats(flight_series);
 
 
                stats = new AltosFlightStats(flight_series);
 

diff --git a/altosuilib/AltosUIFlightSeries.java b/altosuilib/AltosUIFlightSeries.java
index 0bcc8a6e972912853e1c0b8d82789c33955c7683..eade12af1d652b52b6611ba3a32409aeb4cc8067 100644 (file)
--- a/altosuilib/AltosUIFlightSeries.java
+++ b/altosuilib/AltosUIFlightSeries.java
@@ -113,7 +113,7 @@ public class AltosUIFlightSeries extends AltosFlightSeries {
        }
 
        public AltosUITimeSeries[] series(AltosCalData cal_data) {
        }
 
        public AltosUITimeSeries[] series(AltosCalData cal_data) {

-               fill_in();
+               finish();

                return series.toArray(new AltosUITimeSeries[0]);
        }
 
                return series.toArray(new AltosUITimeSeries[0]);
        }