altosui: Report error message back from libaltos

[fw/altos] / altosui / AltosUI.java

diff --git a/altosui/AltosUI.java b/altosui/AltosUI.java
index 13cda63746488fa3f6669be9e29ca20fbf49db71..3e5bcf434fc5b8b8276fe2074873e528d8032d74 100644 (file)
--- a/altosui/AltosUI.java
+++ b/altosui/AltosUI.java
@@ -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) {
@@ -123,50 +122,56 @@ public class AltosUI extends JFrame {
                                                ConnectToDevice();
                                        }
                                });
+               b.setToolTipText("Connect to TeleDongle and monitor telemetry");
                b = addButton(1, 0, "Save Flight Data");
                b.addActionListener(new ActionListener() {
                                        public void actionPerformed(ActionEvent e) {
                                                SaveFlightData();
                                        }
                                });
+               b.setToolTipText("Download and/or delete flight data from an altimeter");
                b = addButton(2, 0, "Replay Flight");
                b.addActionListener(new ActionListener() {
                                        public void actionPerformed(ActionEvent e) {
                                                Replay();
                                        }
                                });
+               b.setToolTipText("Watch an old flight in real-time");
                b = addButton(3, 0, "Graph Data");
                b.addActionListener(new ActionListener() {
                                        public void actionPerformed(ActionEvent e) {
                                                GraphData();
                                        }
                                });
+               b.setToolTipText("Present flight data in a graph and table of statistics");
                b = addButton(4, 0, "Export Data");
                b.addActionListener(new ActionListener() {
                                        public void actionPerformed(ActionEvent e) {
                                                ExportData();
                                        }
                                });
+               b.setToolTipText("Convert flight data for a spreadsheet or GoogleEarth");
                b = addButton(0, 1, "Configure Altimeter");
                b.addActionListener(new ActionListener() {
                                        public void actionPerformed(ActionEvent e) {
                                                ConfigureTeleMetrum();
                                        }
                                });
-
+               b.setToolTipText("Set flight, storage and communication parameters");
                b = addButton(1, 1, "Configure AltosUI");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
                                        ConfigureAltosUI();
                                }
                        });
-
+               b.setToolTipText("Global AltosUI settings");
                b = addButton(2, 1, "Flash Image");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
                                        FlashImage();
                                }
                        });
+               b.setToolTipText("Replace the firmware in any AltusMetrum product");
 
                b = addButton(3, 1, "Fire Igniter");
                b.addActionListener(new ActionListener() {
@@ -174,35 +179,42 @@ public class AltosUI extends JFrame {
                                        FireIgniter();
                                }
                        });
-
+               b.setToolTipText("Remote control of igniters for deployment testing");
                b = addButton(4, 1, "Quit");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
                                        System.exit(0);
                                }
                        });
-
-
+               b.setToolTipText("Close all active windows and terminate AltosUI");
                b = addButton(0, 2, "Scan Channels");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
                                        ScanChannels();
                                }
                        });
-
+               b.setToolTipText("Find what channel an altimeter is sending telemetry on");
                b = addButton(1, 2, "Load Maps");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
                                        LoadMaps();
                                }
                        });
-
+               b.setToolTipText("Download satellite images for off-line flight monitoring");
                b = addButton(2, 2, "Monitor Idle");
                b.addActionListener(new ActionListener() {
                                public void actionPerformed(ActionEvent e) {
                                        IdleMonitor();
                                }
                        });
+               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();
+                               }
+                       });
 
                setTitle("AltOS");
 
@@ -266,6 +278,10 @@ public class AltosUI extends JFrame {
                new AltosSiteMapPreload(AltosUI.this);
        }
 
+       void LaunchController() {
+               new AltosLaunchUI(AltosUI.this);
+       }
+
        /*
         * Replay a flight from telemetry data
         */
@@ -339,7 +355,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;
                }
        }
@@ -349,7 +365,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;
                }
        }
@@ -359,7 +375,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;
                }
        }
@@ -502,6 +518,10 @@ public class AltosUI extends JFrame {
        }
        
        public static void main(final String[] args) {
+               try {
+                       UIManager.setLookAndFeel(UIManager.getSystemLookAndFeelClassName());
+               } catch (Exception e) {
+               }
                /* Handle batch-mode */
                if (args.length == 0) {
                        AltosUI altosui = new AltosUI();