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

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 1c18dbb1..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) {
@@ -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;
 	}
@@ -535,25 +544,17 @@ public class AltosUI extends AltosUIFrame {
 		AltosRecordSet set = record_set(file);
 		if (set == null)
 			return false;
-		System.out.printf("%s:", file.toString());
+		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);
+			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);
+			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(" accel   %6.0f m/s²", stats.max_acceleration);
 		System.out.printf("\n");
 		return true;
 	}