X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosUI.java;h=82ec47465f90a30477bd434daafe270ca7631b24;hp=26591738440a197dbde1d60cb1241644b06296bc;hb=3fd320ea38f2945f5611a09a0e48d16db467d105;hpb=0da4e201041a4420f273c2e0cda77eea78099518

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 26591738..82ec4746 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -23,10 +23,10 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_12.*;
-import org.altusmetrum.altosuilib_12.*;
+import org.altusmetrum.altoslib_13.*;
+import org.altusmetrum.altosuilib_13.*;
 
-public class AltosUI extends AltosUIFrame {
+public class AltosUI extends AltosUIFrame implements AltosEepromGrapher {
 	public AltosVoice voice = new AltosVoice();
 
 	public static boolean load_library(Frame frame) {
@@ -276,7 +276,7 @@ public class AltosUI extends AltosUIFrame {
 	}
 
 	void ConfigureTeleMetrum() {
-		new AltosConfig(AltosUI.this);
+		new AltosConfigFC(AltosUI.this);
 	}
 
 	void ConfigureTeleDongle() {
@@ -320,8 +320,17 @@ public class AltosUI extends AltosUIFrame {
 	/* Connect to TeleMetrum, either directly or through
 	 * a TeleDongle over the packet link
 	 */
+
+	public void graph_flights(AltosEepromList flights) {
+		for (AltosEepromLog flight : flights) {
+			if (flight.graph_selected && flight.file != null) {
+				process_graph(flight.file);
+			}
+		}
+	}
+
 	private void SaveFlightData() {
-		new AltosEepromManage(AltosUI.this, AltosLib.product_any);
+		new AltosEepromManage(this, this, AltosLib.product_any);
 	}
 
 	private static AltosFlightSeries make_series(AltosRecordSet set) {
@@ -397,7 +406,7 @@ public class AltosUI extends AltosUIFrame {
 			String message = ie.getMessage();
 			if (message == null)
 				message = String.format("%s (I/O error)", input.toString());
-			System.err.printf("%s\n", message);
+			System.err.printf("%s: %s\n", input.toString(), message);
 		}
 		return null;
 	}
@@ -408,6 +417,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 +530,31 @@ 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.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.state_enter_speed[AltosLib.ao_flight_drogue] != AltosLib.MISSING)
+			System.out.printf(" drogue-deploy   %6.0f m/s", stats.state_enter_speed[AltosLib.ao_flight_drogue]);
+		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 +565,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 +602,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 +632,10 @@ public class AltosUI extends AltosUIFrame {
 						if (!process_summary(file))
 							++errors;
 						break;
+					case process_oneline:
+						if (!process_oneline(file))
+							++errors;
+						break;
 					}
 				}
 			}