altosui: Adapt to flight stats time value changes

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index b302b670677a73fb533eb00c01ad34db656b8438..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.
@@ -372,21 +372,6 @@ public class AltosUI extends AltosUIFrame {
                }
        }
 
-       static AltosRecordSet open_logfile(File file) {
-               try {
-                       if (file.getName().endsWith("telem"))
-                               return new AltosTelemetryFile(new FileInputStream(file));
-                       else
-                               return new AltosEepromFile(new FileReader(file));
-               } catch (FileNotFoundException fe) {
-                       System.out.printf("%s\n", fe.getMessage());
-                       return null;
-               } catch (IOException ie) {
-                       System.out.printf("%s\n", ie.getMessage());
-                       return null;
-               }
-       }
-
        static AltosWriter open_csv(File file) {
                try {
                        return new AltosCSV(file);
@@ -405,6 +390,18 @@ public class AltosUI extends AltosUIFrame {
                }
        }
 
+       static AltosRecordSet record_set(File input) {
+               try {
+                       return AltosLib.record_set(input);
+               } catch (IOException ie) {
+                       String message = ie.getMessage();
+                       if (message == null)
+                               message = String.format("%s (I/O error)", input.toString());
+                       System.err.printf("%s\n", message);
+               }
+               return null;
+       }
+
        static final int process_none = 0;
        static final int process_csv = 1;
        static final int process_kml = 2;
@@ -413,7 +410,7 @@ public class AltosUI extends AltosUIFrame {
        static final int process_summary = 5;
 
        static boolean process_csv(File input) {
-               AltosRecordSet set = open_logfile(input);
+               AltosRecordSet set = record_set(input);
                if (set == null)
                        return false;
 
@@ -434,7 +431,7 @@ public class AltosUI extends AltosUIFrame {
        }
 
        static boolean process_kml(File input) {
-               AltosRecordSet set = open_logfile(input);
+               AltosRecordSet set = record_set(input);
                if (set == null)
                        return false;
 
@@ -455,27 +452,6 @@ public class AltosUI extends AltosUIFrame {
                }
        }
 
-       static AltosRecordSet record_set(File file) {
-               FileInputStream in;
-               if (file.getName().endsWith("telem")) {
-                       try {
-                               in = new FileInputStream(file);
-                               return new AltosTelemetryFile(in);
-                       } catch (Exception e) {
-                               System.out.printf("Failed to open file '%s'\n", file);
-                       }
-               } else {
-
-                       try {
-                               AltosEepromFile f = new AltosEepromFile(new FileReader(file));
-                               return f;
-                       } catch (Exception e) {
-                               System.out.printf("Failed to open file '%s'\n", file);
-                       }
-               }
-               return null;
-       }
-
        static AltosReplayReader replay_file(File file) {
                AltosRecordSet set = record_set(file);
                if (set == null)
@@ -544,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;
        }