altosui: Add a 'Graph Flight' button to the 'landed' tab

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 7bb4ba12bd94b8a172ce1e41fa45fd5f43690ce6..62e612ed07d0fc9282e00e9ab0910f7951db6a6b 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -26,7 +26,7 @@ import java.io.*;
 import java.util.*;
 import java.text.*;
 import java.util.prefs.*;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.*;
 
 import libaltosJNI.*;
 
@@ -67,6 +67,16 @@ public class AltosUI extends JFrame {
                                                      device.toShortString(),
                                                      "Unkonwn I/O error",
                                                      JOptionPane.ERROR_MESSAGE);
+               } catch (TimeoutException te) {
+                       JOptionPane.showMessageDialog(this,
+                                                     device.toShortString(),
+                                                     "Timeout error",
+                                                     JOptionPane.ERROR_MESSAGE);
+               } catch (InterruptedException ie) {
+                       JOptionPane.showMessageDialog(this,
+                                                     device.toShortString(),
+                                                     "Interrupted exception",
+                                                     JOptionPane.ERROR_MESSAGE);
                }
        }
 
@@ -137,7 +147,7 @@ public class AltosUI extends JFrame {
                                                ExportData();
                                        }
                                });
-               b = addButton(0, 1, "Configure TeleMetrum");
+               b = addButton(0, 1, "Configure Altimeter");
                b.addActionListener(new ActionListener() {
                                        public void actionPerformed(ActionEvent e) {
                                                ConfigureTeleMetrum();
@@ -172,6 +182,28 @@ public class AltosUI extends JFrame {
                                }
                        });
 
+
+               b = addButton(0, 2, "Scan Channels");
+               b.addActionListener(new ActionListener() {
+                               public void actionPerformed(ActionEvent e) {
+                                       ScanChannels();
+                               }
+                       });
+
+               b = addButton(1, 2, "Load Maps");
+               b.addActionListener(new ActionListener() {
+                               public void actionPerformed(ActionEvent e) {
+                                       LoadMaps();
+                               }
+                       });
+
+               b = addButton(2, 2, "Monitor Idle");
+               b.addActionListener(new ActionListener() {
+                               public void actionPerformed(ActionEvent e) {
+                                       IdleMonitor();
+                               }
+                       });
+
                setTitle("AltOS");
 
                pane.doLayout();
@@ -226,6 +258,14 @@ public class AltosUI extends JFrame {
                new AltosIgniteUI(AltosUI.this);
        }
 
+       void ScanChannels() {
+               new AltosScanUI(AltosUI.this);
+       }
+
+       void LoadMaps() {
+               new AltosSiteMapPreload(AltosUI.this);
+       }
+
        /*
         * Replay a flight from telemetry data
         */
@@ -236,7 +276,7 @@ public class AltosUI extends JFrame {
                AltosRecordIterable iterable = chooser.runDialog();
                if (iterable != null) {
                        AltosFlightReader reader = new AltosReplayReader(iterable.iterator(),
-                                                                        chooser.filename());
+                                                                        chooser.file());
                        new AltosFlightUI(voice, reader);
                }
        }
@@ -270,13 +310,24 @@ public class AltosUI extends JFrame {
                AltosRecordIterable record_reader = chooser.runDialog();
                if (record_reader == null)
                        return;
-               new AltosGraphUI(record_reader);
+               try {
+                       new AltosGraphUI(record_reader);
+               } catch (InterruptedException ie) {
+               } catch (IOException ie) {
+               }
        }
 
        private void ConfigureAltosUI() {
                new AltosConfigureUI(AltosUI.this, voice);
        }
 
+       private void IdleMonitor() {
+               try {
+                       new AltosIdleMonitorUI(this);
+               } catch (Exception e) {
+               }
+       }
+
        static AltosRecordIterable open_logfile(String filename) {
                File file = new File (filename);
                try {
@@ -380,7 +431,7 @@ public class AltosUI extends JFrame {
                        } else {
                                recs = new AltosTelemetryIterable(in);
                        }
-                       reader = new AltosReplayReader(recs.iterator(), filename);
+                       reader = new AltosReplayReader(recs.iterator(), new File(filename));
                        AltosFlightUI flight_ui = new AltosFlightUI(new AltosVoice(), reader);
                        flight_ui.set_exit_on_close();
                        return;