altosui: Find actual landing time when computing stats (trac #23)

Look for the last time the height went from >10m to <2m from the
nominal landing altitude and use that as the landing time when
computing things like main descent speed, time under main etc.

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

1 files changed, 10 insertions, 6 deletions

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 8799d560..89f66c06 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -423,17 +423,17 @@ public class AltosUI extends AltosFrame {
 		}
 	}
 
-	static AltosRecordIterable record_iterable_file(String filename) {
+	static AltosRecordIterable record_iterable(File file) {
 		FileInputStream in;
 		try {
-			in = new FileInputStream(filename);
+			in = new FileInputStream(file);
 		} catch (Exception e) {
-			System.out.printf("Failed to open file '%s'\n", filename);
+			System.out.printf("Failed to open file '%s'\n", file);
 			return null;
 		}
 		AltosRecordIterable recs;
 		AltosReplayReader reader;
-		if (filename.endsWith("eeprom")) {
+		if (file.getName().endsWith("eeprom")) {
 			recs = new AltosEepromIterable(in);
 		} else {
 			recs = new AltosTelemetryIterable(in);
@@ -441,6 +441,10 @@ public class AltosUI extends AltosFrame {
 		return recs;
 	}
 
+	static AltosRecordIterable record_iterable_file(String filename) {
+		return record_iterable (new File(filename));
+	}
+
 	static AltosReplayReader replay_file(String filename) {
 		AltosRecordIterable recs = record_iterable_file(filename);
 		if (recs == null)
@@ -466,9 +470,9 @@ public class AltosUI extends AltosFrame {
 	}
 	
 	static void process_summary(String filename) {
-		AltosReplayReader reader = replay_file(filename);
+		AltosRecordIterable iterable = record_iterable_file(filename);
 		try {
-			AltosFlightStats stats = new AltosFlightStats(reader);
+			AltosFlightStats stats = new AltosFlightStats(iterable);
 			if (stats.serial > 0)
 				System.out.printf("Serial:       %5d\n", stats.serial);
 			if (stats.flight > 0)