X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=63cb486c1b075b9041a8e240e1a012874436935a;hp=33ce274a26d7393f31e2fc2f43f150fcb82b3e8d;hb=7bd220dfd9b3fb0e42eb90c3b37eb7b4169eb21b;hpb=e1463d8e265dfd42c824d90088cd2a51b4cf8131

diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java
index 33ce274a..63cb486c 100644
--- a/ao-tools/altosui/AltosUI.java
+++ b/ao-tools/altosui/AltosUI.java
@@ -40,6 +40,10 @@ import altosui.AltosLog;
 import altosui.AltosVoice;
 import altosui.AltosFlightStatusTableModel;
 import altosui.AltosFlightInfoTableModel;
+import altosui.AltosChannelMenu;
+import altosui.AltosFlashUI;
+import altosui.AltosLogfileChooser;
+import altosui.AltosCSVUI;
 
 import libaltosJNI.*;
 
@@ -453,6 +457,14 @@ public class AltosUI extends JFrame {
 		}
 	}
 
+	void ConfigureTeleMetrum() {
+		new AltosConfig(AltosUI.this);
+	}
+
+	void FlashImage() {
+		new AltosFlashUI(AltosUI.this);
+	}
+
 	/*
 	 * Open an existing telemetry file and replay it in realtime
 	 */
@@ -519,33 +531,12 @@ public class AltosUI extends JFrame {
 	 * Replay a flight from telemetry data
 	 */
 	private void Replay() {
-		JFileChooser	logfile_chooser = new JFileChooser();
-
-		logfile_chooser.setDialogTitle("Select Flight Record File");
-		logfile_chooser.setFileFilter(new FileNameExtensionFilter("Flight data file", "eeprom", "telem"));
-		logfile_chooser.setCurrentDirectory(AltosPreferences.logdir());
-		int returnVal = logfile_chooser.showOpenDialog(AltosUI.this);
-
-		if (returnVal == JFileChooser.APPROVE_OPTION) {
-			File file = logfile_chooser.getSelectedFile();
-			if (file == null)
-				System.out.println("No file selected?");
-			String	filename = file.getName();
-			try {
-				FileInputStream	replay = new FileInputStream(file);
-				DisplayThread	thread;
-				if (filename.endsWith("eeprom"))
-				    thread = new ReplayEepromThread(replay, filename);
-				else
-				    thread = new ReplayTelemetryThread(replay, filename);
-				run_display(thread);
-			} catch (FileNotFoundException ee) {
-				JOptionPane.showMessageDialog(AltosUI.this,
-							      filename,
-							      "Cannot open telemetry file",
-							      JOptionPane.ERROR_MESSAGE);
-			}
-		}
+		AltosLogfileChooser chooser = new AltosLogfileChooser(
+			AltosUI.this);
+		AltosReader reader = chooser.runDialog();
+		if (reader != null)
+			run_display(new ReplayThread(reader,
+						     chooser.filename()));
 	}
 
 	/* Connect to TeleMetrum, either directly or through
@@ -555,6 +546,14 @@ public class AltosUI extends JFrame {
 		new AltosEepromDownload(AltosUI.this);
 	}
 
+	/* Load a flight log file and write out a CSV file containing
+	 * all of the data in standard units
+	 */
+
+	private void ExportData() {
+		new AltosCSVUI(AltosUI.this);
+	}
+
 	/* Create the AltosUI menus
 	 */
 	private void createMenu() {
@@ -585,6 +584,22 @@ public class AltosUI extends JFrame {
 				});
 			menu.add(item);
 
+			item = new JMenuItem("Flash Image",KeyEvent.VK_F);
+			item.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						FlashImage();
+					}
+				});
+			menu.add(item);
+
+			item = new JMenuItem("Export Data",KeyEvent.VK_F);
+			item.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						ExportData();
+					}
+				});
+			menu.add(item);
+
 			item = new JMenuItem("Quit",KeyEvent.VK_Q);
 			item.setAccelerator(KeyStroke.getKeyStroke(KeyEvent.VK_Q,
 								   ActionEvent.CTRL_MASK));
@@ -628,6 +643,15 @@ public class AltosUI extends JFrame {
 				});
 
 			menu.add(item);
+
+			item = new JMenuItem("Configure TeleMetrum device",KeyEvent.VK_T);
+			item.addActionListener(new ActionListener() {
+					public void actionPerformed(ActionEvent e) {
+						ConfigureTeleMetrum();
+					}
+				});
+
+			menu.add(item);
 		}
 		// Log menu
 		{
@@ -680,26 +704,16 @@ public class AltosUI extends JFrame {
 
 		// Channel menu
 		{
-			menu = new JMenu("Channel", true);
-			menu.setMnemonic(KeyEvent.VK_C);
-			menubar.add(menu);
-			ButtonGroup group = new ButtonGroup();
-
-			for (int c = 0; c <= 9; c++) {
-				radioitem = new JRadioButtonMenuItem(String.format("Channel %1d (%7.3fMHz)", c,
-										   434.550 + c * 0.1),
-								     c == AltosPreferences.channel());
-				radioitem.setActionCommand(String.format("%d", c));
-				radioitem.addActionListener(new ActionListener() {
+			menu = new AltosChannelMenu(AltosPreferences.channel());
+			menu.addActionListener(new ActionListener() {
 						public void actionPerformed(ActionEvent e) {
 							int new_channel = Integer.parseInt(e.getActionCommand());
 							AltosPreferences.set_channel(new_channel);
 							serial_line.set_channel(new_channel);
 						}
-					});
-				menu.add(radioitem);
-				group.add(radioitem);
-			}
+				});
+			menu.setMnemonic(KeyEvent.VK_C);
+			menubar.add(menu);
 		}
 
 		this.setJMenuBar(menubar);