X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=altosui%2FAltosUI.java;h=75a12ecef1b6d0f174e37281098ae49d76e7ebd6;hb=cf1e95810559584705d0b8a787375938c68e07c6;hp=27c41838e12ea15189d50bf65d4501f2619d9ddb;hpb=186dfc7c72aa7eba281f29f917088e49e44c2ddc;p=fw%2Faltos

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 27c41838..75a12ece 100644
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -30,7 +30,7 @@ import java.util.concurrent.*;
 
 import libaltosJNI.*;
 
-public class AltosUI extends JFrame {
+public class AltosUI extends AltosFrame {
 	public AltosVoice voice = new AltosVoice();
 
 	public static boolean load_library(Frame frame) {
@@ -52,8 +52,7 @@ public class AltosUI extends JFrame {
 				new AltosFlightUI(voice, reader, device.getSerial());
 		} catch (FileNotFoundException ee) {
 			JOptionPane.showMessageDialog(AltosUI.this,
-						      String.format("Cannot open device \"%s\"",
-								    device.toShortString()),
+						      ee.getMessage(),
 						      "Cannot open target device",
 						      JOptionPane.ERROR_MESSAGE);
 		} catch (AltosSerialInUseException si) {
@@ -166,28 +165,29 @@ public class AltosUI extends JFrame {
 				}
 			});
 		b.setToolTipText("Global AltosUI settings");
-		b = addButton(2, 1, "Flash Image");
+
+		b = addButton(2, 1, "Configure Ground Station");
 		b.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					FlashImage();
+					ConfigureTeleDongle();
 				}
 			});
-		b.setToolTipText("Replace the firmware in any AltusMetrum product");
 
-		b = addButton(3, 1, "Fire Igniter");
+		b = addButton(3, 1, "Flash Image");
 		b.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					FireIgniter();
+					FlashImage();
 				}
 			});
-		b.setToolTipText("Remote control of igniters for deployment testing");
-		b = addButton(4, 1, "Quit");
+		b.setToolTipText("Replace the firmware in any AltusMetrum product");
+
+		b = addButton(4, 1, "Fire Igniter");
 		b.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
-					System.exit(0);
+					FireIgniter();
 				}
 			});
-		b.setToolTipText("Close all active windows and terminate AltosUI");
+		b.setToolTipText("Remote control of igniters for deployment testing");
 		b = addButton(0, 2, "Scan Channels");
 		b.addActionListener(new ActionListener() {
 				public void actionPerformed(ActionEvent e) {
@@ -210,6 +210,21 @@ public class AltosUI extends JFrame {
 			});
 		b.setToolTipText("Check flight readiness of altimeter in idle mode");
 
+		b = addButton(3, 2, "Launch Controller");
+		b.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					LaunchController();
+				}
+			});
+
+		b = addButton(4, 2, "Quit");
+		b.addActionListener(new ActionListener() {
+				public void actionPerformed(ActionEvent e) {
+					System.exit(0);
+				}
+			});
+		b.setToolTipText("Close all active windows and terminate AltosUI");
+
 		setTitle("AltOS");
 
 		pane.doLayout();
@@ -256,6 +271,10 @@ public class AltosUI extends JFrame {
 		new AltosConfig(AltosUI.this);
 	}
 
+	void ConfigureTeleDongle() {
+		new AltosConfigTD(AltosUI.this);
+	}
+
 	void FlashImage() {
 		AltosFlashUI.show(AltosUI.this);
 	}
@@ -272,6 +291,10 @@ public class AltosUI extends JFrame {
 		new AltosSiteMapPreload(AltosUI.this);
 	}
 
+	void LaunchController() {
+		new AltosLaunchUI(AltosUI.this);
+	}
+
 	/*
 	 * Replay a flight from telemetry data
 	 */
@@ -345,7 +368,7 @@ public class AltosUI extends JFrame {
 			else
 				return new AltosTelemetryIterable(in);
 		} catch (FileNotFoundException fe) {
-			System.out.printf("Cannot open '%s'\n", filename);
+			System.out.printf("%s\n", fe.getMessage());
 			return null;
 		}
 	}
@@ -355,7 +378,7 @@ public class AltosUI extends JFrame {
 		try {
 			return new AltosCSV(file);
 		} catch (FileNotFoundException fe) {
-			System.out.printf("Cannot open '%s'\n", filename);
+			System.out.printf("%s\n", fe.getMessage());
 			return null;
 		}
 	}
@@ -365,7 +388,7 @@ public class AltosUI extends JFrame {
 		try {
 			return new AltosKML(file);
 		} catch (FileNotFoundException fe) {
-			System.out.printf("Cannot open '%s'\n", filename);
+			System.out.printf("%s\n", fe.getMessage());
 			return null;
 		}
 	}
@@ -413,17 +436,17 @@ public class AltosUI extends JFrame {
 		}
 	}
 
-	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);
@@ -431,6 +454,10 @@ public class AltosUI extends JFrame {
 		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)
@@ -456,9 +483,9 @@ public class AltosUI extends JFrame {
 	}
 	
 	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)
@@ -509,7 +536,7 @@ public class AltosUI extends JFrame {
 	
 	public static void main(final String[] args) {
 		try {
-			UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+			UIManager.setLookAndFeel(AltosPreferences.look_and_feel());
 		} catch (Exception e) {
 		}
 		/* Handle batch-mode */