X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=ao-tools%2Faltosui%2FAltosUI.java;h=7f008f3aadb7930e869a9916c3d56e2186fd88e5;hp=8880618b251b3c2b4daa68a6673caa474721d950;hb=10330d23518c94a8b791193a97a6cc07b1c9a97c;hpb=4bea4c327e002ce8f88218f0d840af7c1521bc35 diff --git a/ao-tools/altosui/AltosUI.java b/ao-tools/altosui/AltosUI.java index 8880618b..7f008f3a 100644 --- a/ao-tools/altosui/AltosUI.java +++ b/ao-tools/altosui/AltosUI.java @@ -25,18 +25,14 @@ import javax.swing.table.*; import java.io.*; import java.util.*; import java.text.*; -import gnu.io.CommPortIdentifier; +import java.util.prefs.*; +import gnu.io.*; import altosui.AltosSerial; import altosui.AltosSerialMonitor; import altosui.AltosTelemetry; import altosui.AltosState; - -class AltosUIMonitor implements AltosSerialMonitor { - public void data(String data) { - System.out.println(data); - } -} +import altosui.AltosDeviceDialog; class AltosFlightStatusTableModel extends AbstractTableModel { private String[] columnNames = {"Height (m)", "State", "RSSI (dBm)", "Speed (m/s)" }; @@ -192,7 +188,6 @@ public class AltosUI extends JFrame { createMenu(); serialLine = new AltosSerial(); - serialLine.monitor(new AltosUIMonitor()); int dpi = Toolkit.getDefaultToolkit().getScreenResolution(); this.setSize(new Dimension (infoValueMetrics.charWidth('0') * 6 * 20, statusHeight * 4 + infoHeight * 17)); @@ -337,32 +332,63 @@ public class AltosUI extends JFrame { info_finish(); } + /* User Preferences */ + Preferences altosui_preferences = Preferences.userNodeForPackage(this.getClass()); - final JFileChooser deviceChooser = new JFileChooser(); - final JFileChooser logdirChooser = new JFileChooser(); - final String logdirName = "TeleMetrum"; - File logdir = null; + /* Log directory */ + private File logdir = null; - private void setLogdir() { - if (logdir == null) - logdir = new File(logdirChooser.getCurrentDirectory(), logdirName); - logdirChooser.setCurrentDirectory(logdir); + /* logdir preference name */ + final static String logdirPreference = "LOGDIR"; + + /* Default logdir is ~/TeleMetrum */ + final static String logdirName = "TeleMetrum"; + + /* Initialize logdir from preferences */ + { + String logdir_string = altosui_preferences.get(logdirPreference, null); + if (logdir_string != null) + logdir = new File(logdir_string); + else + /* a hack -- make the file chooser tell us what the default directory + * would be and stick our logdir in a subdirectory of that. + */ + logdir = new File(new JFileChooser().getCurrentDirectory(), logdirName); + } + + private void set_logdir(File new_logdir) { + logdir = new_logdir; + System.out.printf("Set logdir to %s\n", logdir.toString()); + synchronized (altosui_preferences) { + altosui_preferences.put(logdirPreference, logdir.getPath()); + try { + altosui_preferences.flush(); + } catch (BackingStoreException ee) { + JOptionPane.showMessageDialog(AltosUI.this, + altosui_preferences.absolutePath(), + "Cannot save prefernces", + JOptionPane.ERROR_MESSAGE); + } + } } - private void makeLogdir() { - setLogdir(); - if (!logdir.exists()) { - if (!logdir.mkdirs()) + private boolean check_dir(File dir) { + if (!dir.exists()) { + if (!dir.mkdirs()) { JOptionPane.showMessageDialog(AltosUI.this, - logdir.getName(), + dir.getName(), "Cannot create directory", JOptionPane.ERROR_MESSAGE); - } else if (!logdir.isDirectory()) { + return false; + } + } else if (!dir.isDirectory()) { JOptionPane.showMessageDialog(AltosUI.this, - logdir.getName(), + dir.getName(), "Is not a directory", JOptionPane.ERROR_MESSAGE); + return false; } + return true; } private void PickSerialDevice() { @@ -373,23 +399,94 @@ public class AltosUI extends JFrame { } } + class DisplayThread extends Thread { + String read() throws InterruptedException { return null; } + + void close() { } + + void update(AltosState state) throws InterruptedException { } + + public void run() { + String line; + AltosState state = null; + + info_reset(); + info_finish(); + try { + while ((line = read()) != null) { + try { + AltosTelemetry t = new AltosTelemetry(line); + state = new AltosState(t, state); + update(state); + show(state); + } catch (ParseException pp) { + System.out.printf("Parse error on %s\n", line); + System.out.println("exception " + pp); + } + } + } catch (InterruptedException ee) { + } finally { + close(); + } + } + } + + class DeviceThread extends DisplayThread { + AltosSerial serial; + + String read() throws InterruptedException { + System.out.println("Waiting for telemetry"); + String s = serial.get_telem(); + System.out.println("Got telemetry " + s); + return s; + } + + void close() { + serial.close(); + System.out.println("DisplayThread done"); + } + + public DeviceThread(AltosSerial s) { + serial = s; + } + } + private void ConnectToDevice() { - PickSerialDevice(); - int returnVal = deviceChooser.showOpenDialog(AltosUI.this); + AltosDevice device = AltosDeviceDialog.show(AltosUI.this, "TeleDongle"); - if (returnVal == JFileChooser.APPROVE_OPTION) { - File file = deviceChooser.getSelectedFile(); + if (device != null) { try { - serialLine.open(file); + serialLine.connect(device.tty); + DeviceThread thread = new DeviceThread(serialLine); + run_display(thread); } catch (FileNotFoundException ee) { JOptionPane.showMessageDialog(AltosUI.this, - file.getName(), + device.tty, "Cannot open serial port", JOptionPane.ERROR_MESSAGE); + } catch (NoSuchPortException ee) { + JOptionPane.showMessageDialog(AltosUI.this, + device.tty, + "No such serial port", + JOptionPane.ERROR_MESSAGE); + } catch (PortInUseException ee) { + JOptionPane.showMessageDialog(AltosUI.this, + device.tty, + "Port in use", + JOptionPane.ERROR_MESSAGE); + } catch (IOException ee) { + JOptionPane.showMessageDialog(AltosUI.this, + device.tty, + "Unkonwn I/O error", + JOptionPane.ERROR_MESSAGE); } } } + void DisconnectFromDevice () { + stop_display(); + } + String readline(FileInputStream s) throws IOException { int c; String line = ""; @@ -408,7 +505,7 @@ public class AltosUI extends JFrame { * Open an existing telemetry file and replay it in realtime */ - class ReplayThread extends Thread { + class ReplayThread extends DisplayThread { FileInputStream replay; String filename; @@ -417,60 +514,66 @@ public class AltosUI extends JFrame { filename = name; } - /* Run the replay in a separate thread - * so that the UI can update - */ - public void run() { - String line; - AltosState state = null; + String read() { try { - while ((line = readline(replay)) != null) { - try { - AltosTelemetry t = new AltosTelemetry(line); - state = new AltosState(t, state); - show(state); - - /* Make it run in realtime after the rocket leaves the pad */ - try { - if (state.state > AltosTelemetry.ao_flight_pad) - Thread.sleep((int) (state.time_change * 1000)); - } catch (InterruptedException e) {} - } catch (ParseException pp) { - JOptionPane.showMessageDialog(AltosUI.this, - line, - "error parsing", - JOptionPane.ERROR_MESSAGE); - break; - } - } + return readline(replay); } catch (IOException ee) { JOptionPane.showMessageDialog(AltosUI.this, filename, "error reading", JOptionPane.ERROR_MESSAGE); - } finally { - try { - replay.close(); - } catch (IOException e) {} } + return null; + } + + void close () { + try { + replay.close(); + } catch (IOException ee) { + } + } + + void update(AltosState state) throws InterruptedException { + /* Make it run in realtime after the rocket leaves the pad */ + if (state.state > AltosTelemetry.ao_flight_pad) + Thread.sleep((int) (state.time_change * 1000)); } } + Thread display_thread; + + private void stop_display() { + if (display_thread != null && display_thread.isAlive()) + display_thread.interrupt(); + display_thread = null; + } + + private void run_display(Thread thread) { + stop_display(); + display_thread = thread; + display_thread.start(); + } + + /* + * Replay a flight from telemetry data + */ private void Replay() { - setLogdir(); - logdirChooser.setDialogTitle("Select Telemetry File"); - logdirChooser.setFileFilter(new FileNameExtensionFilter("Telemetry file", "telem")); - int returnVal = logdirChooser.showOpenDialog(AltosUI.this); + JFileChooser logfile_chooser = new JFileChooser(); + + logfile_chooser.setDialogTitle("Select Telemetry File"); + logfile_chooser.setFileFilter(new FileNameExtensionFilter("Telemetry file", "telem")); + logfile_chooser.setCurrentDirectory(logdir); + int returnVal = logfile_chooser.showOpenDialog(AltosUI.this); if (returnVal == JFileChooser.APPROVE_OPTION) { - File file = logdirChooser.getSelectedFile(); + File file = logfile_chooser.getSelectedFile(); if (file == null) System.out.println("No file selected?"); String filename = file.getName(); try { FileInputStream replay = new FileInputStream(file); ReplayThread thread = new ReplayThread(replay, filename); - thread.start(); + run_display(thread); } catch (FileNotFoundException ee) { JOptionPane.showMessageDialog(AltosUI.this, filename, @@ -480,9 +583,31 @@ public class AltosUI extends JFrame { } } + /* Connect to TeleMetrum, either directly or through + * a TeleDongle over the packet link + */ private void SaveFlightData() { } + /* Configure the log directory. This is where all telemetry and eeprom files + * will be written to, and where replay will look for telemetry files + */ + private void ConfigureLog() { + JFileChooser logdir_chooser = new JFileChooser(); + + logdir_chooser.setDialogTitle("Configure Data Logging Directory"); + logdir_chooser.setCurrentDirectory(logdir.getParentFile()); + logdir_chooser.setFileSelectionMode(JFileChooser.DIRECTORIES_ONLY); + + if (logdir_chooser.showDialog(AltosUI.this, "Select Directory") == JFileChooser.APPROVE_OPTION) { + File dir = logdir_chooser.getSelectedFile(); + if (check_dir(dir)) + set_logdir(dir); + } + } + + /* Create the AltosUI menus + */ private void createMenu() { JMenuBar menubar = new JMenuBar(); JMenu menu; @@ -523,7 +648,7 @@ public class AltosUI extends JFrame { item = new JMenuItem("Disconnect from Device",KeyEvent.VK_D); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { - serialLine.close(); + DisconnectFromDevice(); } }); menu.add(item); @@ -562,6 +687,7 @@ public class AltosUI extends JFrame { item = new JMenuItem("Configure Log",KeyEvent.VK_C); item.addActionListener(new ActionListener() { public void actionPerformed(ActionEvent e) { + ConfigureLog(); } }); menu.add(item);