X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=9ab451defca7847e24354195809dad779f2b8231;hp=e1bbee307835521797f212d1731db6e30961968c;hb=8463ffcaca6bcd31e645aba71c171f548dce96d8;hpb=16916be51d746b1e1057b3219e5bec8f8814259e

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index e1bbee30..9ab451de 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -28,25 +28,6 @@ import java.text.*;
 import java.util.prefs.*;
 import java.util.concurrent.LinkedBlockingQueue;
 
-import altosui.Altos;
-import altosui.AltosSerial;
-import altosui.AltosSerialMonitor;
-import altosui.AltosRecord;
-import altosui.AltosTelemetry;
-import altosui.AltosState;
-import altosui.AltosDeviceDialog;
-import altosui.AltosPreferences;
-import altosui.AltosLog;
-import altosui.AltosVoice;
-import altosui.AltosFlightInfoTableModel;
-import altosui.AltosFlashUI;
-import altosui.AltosLogfileChooser;
-import altosui.AltosCSVUI;
-import altosui.AltosLine;
-import altosui.AltosStatusTable;
-import altosui.AltosInfoTable;
-import altosui.AltosDisplayThread;
-
 import libaltosJNI.*;
 
 public class AltosUI extends JFrame {
@@ -83,6 +64,27 @@ public class AltosUI extends JFrame {
 		}
 	}
 
+	Container	pane;
+	GridBagLayout	gridbag;
+
+	JButton addButton(int x, int y, String label) {
+		GridBagConstraints	c;
+		JButton			b;
+
+		c = new GridBagConstraints();
+		c.gridx = x; c.gridy = y;
+		c.fill = GridBagConstraints.BOTH;
+		c.weightx = 1;
+		c.weighty = 1;
+		b = new JButton(label);
+
+		Dimension ps = b.getPreferredSize();
+
+		gridbag.setConstraints(b, c);
+		add(b, c);
+		return b;
+	}
+
 	public AltosUI() {
 
 		load_library(null);
@@ -93,13 +95,67 @@ public class AltosUI extends JFrame {
 
 		AltosPreferences.init(this);
 
+		pane = getContentPane();
+		gridbag = new GridBagLayout();
+		pane.setLayout(gridbag);
+
+		JButton	b;
+
+		b = addButton(0, 0, "Monitor Flight");
+		b.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						ConnectToDevice();
+					}
+				});
+		b = addButton(1, 0, "Save Flight Data");
+		b.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						SaveFlightData();
+					}
+				});
+		b = addButton(2, 0, "Replay Flight");
+		b.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						Replay();
+					}
+				});
+		b = addButton(0, 1, "Graph Data");
+		b.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						GraphData();
+					}
+				});
+		b = addButton(1, 1, "Export Data");
+		b.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						ExportData();
+					}
+				});
+		b = addButton(2, 1, "Configure TeleMetrum");
+		b.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						ConfigureTeleMetrum();
+					}
+				});
+
 		setTitle("AltOS");
 
 		createMenu();
 
-		int dpi = Toolkit.getDefaultToolkit().getScreenResolution();
-		this.setSize(new Dimension (300, 100));
-		this.validate();
+		pane.doLayout();
+		pane.validate();
+
+		doLayout();
+		validate();
+
+		setVisible(true);
+
+		Insets i = getInsets();
+		Dimension ps = rootPane.getPreferredSize();
+		ps.width += i.left + i.right;
+		ps.height += i.top + i.bottom;
+		setPreferredSize(ps);
+		setSize(ps);
 		setDefaultCloseOperation(JFrame.DO_NOTHING_ON_CLOSE);
 		addWindowListener(new WindowAdapter() {
 			@Override
@@ -184,22 +240,6 @@ public class AltosUI extends JFrame {
 			menu.setMnemonic(KeyEvent.VK_F);
 			menubar.add(menu);
 
-			item = new JMenuItem("Replay File",KeyEvent.VK_R);
-			item.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						Replay();
-					}
-				});
-			menu.add(item);
-
-			item = new JMenuItem("Save Flight Data",KeyEvent.VK_S);
-			item.addActionListener(new ActionListener() {
-					public void actionPerformed(ActionEvent e) {
-						SaveFlightData();
-					}
-				});
-			menu.add(item);
-
 			item = new JMenuItem("Flash Image",KeyEvent.VK_I);
 			item.addActionListener(new ActionListener() {
 					public void actionPerformed(ActionEvent e) {
@@ -397,7 +437,26 @@ public class AltosUI extends JFrame {
 	public static void main(final String[] args) {
 		int	process = 0;
 		/* Handle batch-mode */
-		if (args.length > 0) {
+        if (args.length == 2 && args[0].equals("--replay")) {
+            String filename = args[1];
+            FileInputStream in;
+            try {
+                in = new FileInputStream(filename);
+            } catch (Exception e) {
+                System.out.printf("Failed to open file '%s'\n", filename);
+                return;
+            }
+            AltosRecordIterable recs;
+            AltosReplayReader reader;
+            if (filename.endsWith("eeprom")) {
+              recs = new AltosEepromIterable(in);
+            } else {
+              recs = new AltosTelemetryIterable(in); 
+            }
+            reader = new AltosReplayReader(recs.iterator(), filename);
+            new AltosFlightUI(new AltosVoice(), reader);
+            return;
+        } else if (args.length > 0) {
 			for (int i = 0; i < args.length; i++) {
 				if (args[i].equals("--kml"))
 					process |= process_kml;