X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=71481519910ece9d9f75e1d060c240b663e45402;hb=f0d1468ceae065f0cdae6f6ae3323dec5636f073;hp=29eda2ece4566f793bbe1cb386a3849d00e28596;hpb=c89a34d1eb25155405b0036baeadc7bbfeade1c2;p=fw%2Faltos

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 29eda2ec..71481519 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -245,6 +245,13 @@ public class AltosUI extends JFrame {
 		new AltosCSVUI(AltosUI.this);
 	}
 
+	/* Load a flight log CSV file and display a pretty graph.
+	 */
+
+	private void GraphData() {
+		new AltosGraphUI(AltosUI.this);
+	}
+
 	/* Create the AltosUI menus
 	 */
 	private void createMenu() {
@@ -291,6 +298,14 @@ public class AltosUI extends JFrame {
 				});
 			menu.add(item);
 
+			item = new JMenuItem("Graph Data",KeyEvent.VK_F);
+			item.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						GraphData();
+					}
+				});
+			menu.add(item);
+
 			item = new JMenuItem("Quit",KeyEvent.VK_Q);
 			item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
 								   ActionEvent.CTRL_MASK));
@@ -411,13 +426,6 @@ public class AltosUI extends JFrame {
 
 	}
 
-	static String replace_extension(String input, String extension) {
-		int dot = input.lastIndexOf(".");
-		if (dot > 0)
-			input = input.substring(0,dot);
-		return input.concat(extension);
-	}
-
 	static AltosRecordIterable open_logfile(String filename) {
 		File file = new File (filename);
 		try {
@@ -434,7 +442,7 @@ public class AltosUI extends JFrame {
 		}
 	}
 
-	static AltosCSV open_csv(String filename) {
+	static AltosWriter open_csv(String filename) {
 		File file = new File (filename);
 		try {
 			return new AltosCSV(file);
@@ -444,32 +452,68 @@ public class AltosUI extends JFrame {
 		}
 	}
 
-	static void process_file(String input) {
-		String output = replace_extension(input,".csv");
-		if (input.equals(output)) {
-			System.out.printf("Not processing '%s'\n", input);
-			return;
+	static AltosWriter open_kml(String filename) {
+		File file = new File (filename);
+		try {
+			return new AltosKML(file);
+		} catch (FileNotFoundException fe) {
+			System.out.printf("Cannot open '%s'\n", filename);
+			return null;
 		}
-		System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
+	}
+
+	static final int process_csv = 1;
+	static final int process_kml = 2;
+
+	static void process_file(String input, int process) {
 		AltosRecordIterable iterable = open_logfile(input);
 		if (iterable == null)
 			return;
-		AltosCSV writer = open_csv(output);
-		if (writer == null)
-			return;
-		writer.write(iterable);
-		writer.close();
+		if (process == 0)
+			process = process_csv;
+		if ((process & process_csv) != 0) {
+			String output = Altos.replace_extension(input,".csv");
+			System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
+			if (input.equals(output)) {
+				System.out.printf("Not processing '%s'\n", input);
+			} else {
+				AltosWriter writer = open_csv(output);
+				if (writer != null) {
+					writer.write(iterable);
+					writer.close();
+				}
+			}
+		}
+		if ((process & process_kml) != 0) {
+			String output = Altos.replace_extension(input,".kml");
+			System.out.printf("Processing \"%s\" to \"%s\"\n", input, output);
+			if (input.equals(output)) {
+				System.out.printf("Not processing '%s'\n", input);
+			} else {
+				AltosWriter writer = open_kml(output);
+				if (writer == null)
+					return;
+				writer.write(iterable);
+				writer.close();
+			}
+		}
 	}
 
 	public static void main(final String[] args) {
-
+		int	process = 0;
 		/* Handle batch-mode */
 		if (args.length > 0) {
-			for (int i = 0; i < args.length; i++)
-				process_file(args[i]);
+			for (int i = 0; i < args.length; i++) {
+				if (args[i].equals("--kml"))
+					process |= process_kml;
+				else if (args[i].equals("--csv"))
+					process |= process_csv;
+				else
+					process_file(args[i], process);
+			}
 		} else {
 			AltosUI altosui = new AltosUI();
 			altosui.setVisible(true);
 		}
 	}
-}
\ No newline at end of file
+}