X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altosui%2FAltosUI.java;h=5dd532bd5c312921ea88376c7f73f1c2d5cc85e2;hp=ad7964e939a77c4f3ec1914c598395f0e35e4915;hb=2b57158737f85c7009658b3e923c66794f01bbdf;hpb=9a4c2c7fc6af922d052e23a1b99bf847fbf9b0e9

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index ad7964e9..5dd532bd 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_4.*;
-import org.altusmetrum.altosuilib_2.*;
+import org.altusmetrum.altoslib_6.*;
+import org.altusmetrum.altosuilib_6.*;
 
 public class AltosUI extends AltosUIFrame {
 	public AltosVoice voice = new AltosVoice();
@@ -99,10 +99,25 @@ public class AltosUI extends AltosUIFrame {
 		return b;
 	}
 
+	/* OSXAdapter interfaces */
+	public void macosx_file_handler(String path) {
+		process_graph(new File(path));
+	}
+
+	public void macosx_quit_handler() {
+		System.exit(0);
+	}
+
+	public void macosx_preferences_handler() {
+		ConfigureAltosUI();
+	}
+
 	public AltosUI() {
 
 		load_library(null);
 
+		register_for_macosx_events();
+
 		AltosUIPreferences.set_component(this);
 
 		pane = getContentPane();
@@ -280,7 +295,7 @@ public class AltosUI extends AltosUIFrame {
 	}
 
 	void LoadMaps() {
-		new AltosSiteMapPreload(AltosUI.this);
+		new AltosUIMapPreload(AltosUI.this);
 	}
 
 	void LaunchController() {
@@ -306,7 +321,7 @@ public class AltosUI extends AltosUIFrame {
 	 * a TeleDongle over the packet link
 	 */
 	private void SaveFlightData() {
-		new AltosEepromManage(AltosUI.this);
+		new AltosEepromManage(AltosUI.this, AltosLib.product_any);
 	}
 
 	/* Load a flight log file and write out a CSV file containing
@@ -456,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;
 	}
 
@@ -544,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);
@@ -559,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)
@@ -572,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;
@@ -600,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;