X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosUI.java;h=5768fd49290ebca1552455e26a8e397e68162a76;hp=0aa5d03ce142ef1a420b2c45d4d581b9654ac829;hb=0d966b74f756e88e5dffa92400b105f540429262;hpb=bd440afc2a6e37b74fffcf1b977e149485095316

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 0aa5d03c..5768fd49 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -22,8 +22,8 @@ import java.awt.event.*;
 import javax.swing.*;
 import java.io.*;
 import java.util.concurrent.*;
-import org.altusmetrum.altoslib_5.*;
-import org.altusmetrum.altosuilib_3.*;
+import org.altusmetrum.altoslib_11.*;
+import org.altusmetrum.altosuilib_11.*;
 
 public class AltosUI extends AltosUIFrame {
 	public AltosVoice voice = new AltosVoice();
@@ -471,7 +471,6 @@ public class AltosUI extends AltosUIFrame {
 		if (reader == null)
 			return false;
 		AltosFlightUI flight_ui = new AltosFlightUI(new AltosVoice(), reader);
-		flight_ui.set_exit_on_close();
 		return true;
 	}
 
@@ -540,7 +539,7 @@ public class AltosUI extends AltosUIFrame {
 			System.out.printf ("process cat\n");
 			for (AltosState state : eef) {
 				System.out.printf ("tick %d state %d height %g\n",
-						   state.tick, state.state, state.height());
+						   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(),
@@ -559,9 +558,9 @@ public class AltosUI extends AltosUIFrame {
 	public static void help(int code) {
 		System.out.printf("Usage: altosui [OPTION]... [FILE]...\n");
 		System.out.printf("  Options:\n");
-		System.out.printf("    --fetchmaps <lat> <lon>\tpre-fetch maps for site map view\n");
 		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("    --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);
@@ -574,10 +573,11 @@ public class AltosUI extends AltosUIFrame {
 			UIManager.setLookAndFeel(AltosUIPreferences.look_and_feel());
 		} catch (Exception e) {
 		}
+		AltosUI altosui = null;
+
 		/* Handle batch-mode */
 		if (args.length == 0) {
-			AltosUI altosui = new AltosUI();
-
+			altosui = new AltosUI();
 			java.util.List<AltosDevice> devices = AltosUSBDevice.list(Altos.product_basestation);
 			if (devices != null)
 				for (AltosDevice device : devices)
@@ -587,16 +587,7 @@ public class AltosUI extends AltosUIFrame {
 			for (int i = 0; i < args.length; i++) {
 				if (args[i].equals("--help"))
 					help(0);
-				else if (args[i].equals("--fetchmaps")) {
-					if (args.length < i + 3) {
-						help(1);
-					} else {
-						double lat = Double.parseDouble(args[i+1]);
-						double lon = Double.parseDouble(args[i+2]);
-//						AltosSiteMap.prefetchMaps(lat, lon);
-						i += 2;
-					}
-				} else if (args[i].equals("--replay"))
+				else if (args[i].equals("--replay"))
 					process = process_replay;
 				else if (args[i].equals("--kml"))
 					process = process_kml;
@@ -615,10 +606,14 @@ public class AltosUI extends AltosUIFrame {
 					switch (process) {
 					case process_none:
 					case process_graph:
+						if (altosui == null)
+							altosui = new AltosUI();
 						if (!process_graph(file))
 							++errors;
 						break;
 					case process_replay:
+						if (altosui == null)
+							altosui = new AltosUI();
 						if (!process_replay(file))
 							++errors;
 						break;