X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosUI.java;h=019bbb9e79e00dbcdbf7dc81229fd38aedabd27c;hp=74e074632b81a263f27b939fee753067e92d28c4;hb=8bbef0c7039f4a0c6ac368fd994c2e52d84d293c;hpb=04c6f4c54ac10f6464ffb8cab2186ac2b2eafb00

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 74e07463..019bbb9e 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -3,7 +3,8 @@
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation; version 2 of the License.
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
  *
  * This program is distributed in the hope that it will be useful, but
  * WITHOUT ANY WARRANTY; without even the implied warranty of
@@ -492,8 +493,8 @@ public class AltosUI extends AltosUIFrame {
 		if (states == null)
 			return false;
 		try {
-			AltosFlightStats stats = new AltosFlightStats(states);
 			System.out.printf("%s:\n", file.toString());
+			AltosFlightStats stats = new AltosFlightStats(states);
 			if (stats.serial != AltosLib.MISSING)
 				System.out.printf("Serial:       %5d\n", stats.serial);
 			if (stats.flight != AltosLib.MISSING)
@@ -545,14 +546,22 @@ public class AltosUI extends AltosUIFrame {
 			AltosStateIterable eef = record_iterable(file);
 
 			for (AltosState state : eef) {
-				System.out.printf ("tick %d state %d height %g\n",
-						   state.tick, state.state(), state.height());
-				if ((state.set & AltosState.set_gps) != 0)
-					System.out.printf ("time %g lat %g lon %g alt %g\n",
-							   state.time_since_boost(),
+				if ((state.set & AltosState.set_gps) != 0) {
+					System.out.printf ("time %d %d-%d-%d %d:%d:%d lat %g lon %g alt %g\n",
+							   state.gps.seconds(),
+							   state.gps.year,
+							   state.gps.month,
+							   state.gps.day,
+							   state.gps.hour,
+							   state.gps.minute,
+							   state.gps.second,
 							   state.gps.lat,
 							   state.gps.lon,
 							   state.gps.alt);
+				} else {
+					System.out.printf ("tick %d state %d height %g\n",
+							   state.tick, state.state(), state.height());
+				}
 			}
 
 		} catch (Exception e) {
@@ -612,15 +621,13 @@ public class AltosUI extends AltosUIFrame {
 					File file = new File(args[i]);
 					switch (process) {
 					case process_none:
-					case process_graph:
 						if (altosui == null)
 							altosui = new AltosUI();
+					case process_graph:
 						if (!process_graph(file))
 							++errors;
 						break;
 					case process_replay:
-						if (altosui == null)
-							altosui = new AltosUI();
 						if (!process_replay(file))
 							++errors;
 						break;