altosui: Add --oneline mode to briefly summarize flights

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 26591738440a197dbde1d60cb1241644b06296bc..1c18dbb19a8a9626299fd80ed4a133a659104d63 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -276,7 +276,7 @@ public class AltosUI extends AltosUIFrame {
        }
 
        void ConfigureTeleMetrum() {
-               new AltosConfig(AltosUI.this);
+               new AltosConfigFC(AltosUI.this);
        }
 
        void ConfigureTeleDongle() {
@@ -408,6 +408,7 @@ public class AltosUI extends AltosUIFrame {
        static final int process_graph = 3;
        static final int process_replay = 4;
        static final int process_summary = 5;
+       static final int process_oneline = 6;
 
        static boolean process_csv(File input) {
                AltosRecordSet set = record_set(input);
@@ -520,11 +521,39 @@ 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;
+       }
+
+       static boolean process_oneline(File file) {
+               AltosRecordSet set = record_set(file);
+               if (set == null)
+                       return false;
+               System.out.printf("%s:", file.toString());
+               AltosFlightSeries series = make_series(set);
+               AltosFlightStats stats = new AltosFlightStats(series);
+//             if (stats.serial != AltosLib.MISSING)
+//                     System.out.printf("Serial:       %5d\n", stats.serial);
+//             if (stats.flight != AltosLib.MISSING)
+//                     System.out.printf("Flight:       %5d\n", stats.flight);
+//             if (stats.year != AltosLib.MISSING)
+//                     System.out.printf("Date:    %04d-%02d-%02d\n",
+//                                       stats.year, stats.month, stats.day);
+//             if (stats.hour != AltosLib.MISSING)
+//                     System.out.printf("Time:      %02d:%02d:%02d UTC\n",
+//                                       stats.hour, stats.minute, stats.second);
+               if (stats.max_height != AltosLib.MISSING)
+                       System.out.printf(" height:  %6.0f m", stats.max_height);
+               if (stats.max_speed != AltosLib.MISSING)
+                       System.out.printf(" speed:   %6.0f m/s", stats.max_speed);
+               if (stats.max_acceleration != AltosLib.MISSING)
+                       System.out.printf(" accel:   %6.0f m/s²", stats.max_acceleration);
                System.out.printf("\n");
                return true;
        }
@@ -535,6 +564,7 @@ public class AltosUI extends AltosUIFrame {
                System.out.printf("    --replay <filename>\t\trelive the glory of past flights \n");
                System.out.printf("    --graph <filename>\t\tgraph a flight\n");
                System.out.printf("    --summary <filename>\t\tText summary of a flight\n");
+               System.out.printf("    --oneline <filename>\t\tOne line summary of a flight\n");
                System.out.printf("    --csv\tgenerate comma separated output for spreadsheets, etc\n");
                System.out.printf("    --kml\tgenerate KML output for use with Google Earth\n");
                System.exit(code);
@@ -571,6 +601,8 @@ public class AltosUI extends AltosUIFrame {
                                        process = process_graph;
                                else if (args[i].equals("--summary"))
                                        process = process_summary;
+                               else if (args[i].equals("--oneline"))
+                                       process = process_oneline;
                                else if (args[i].startsWith("--"))
                                        help(1);
                                else {
@@ -599,6 +631,10 @@ public class AltosUI extends AltosUIFrame {
                                                if (!process_summary(file))
                                                        ++errors;
                                                break;
+                                       case process_oneline:
+                                               if (!process_oneline(file))
+                                                       ++errors;
+                                               break;
                                        }
                                }
                        }