altosui: Report error message back from libaltos

[fw/altos] / altosui / AltosScanUI.java

diff --git a/altosui/AltosScanUI.java b/altosui/AltosScanUI.java
index 9a483138d32b35c23a64a266b39a85fb5b6fcb97..df5c51d4a2e3ab74d98dd9ad7b0a7bd7fe9bd1f8 100644 (file)
--- a/altosui/AltosScanUI.java
+++ b/altosui/AltosScanUI.java
@@ -30,17 +30,17 @@ import java.util.prefs.*;
 import java.util.concurrent.*;
 
 class AltosScanResult {
-       String  callsign;
-       int     serial;
-       int     flight;
-       double  frequency;
-       int     telemetry;
+       String          callsign;
+       int             serial;
+       int             flight;
+       AltosFrequency  frequency;
+       int             telemetry;
        
        boolean interrupted = false;
        
        public String toString() {
-               return String.format("%-9.9s serial %-4d flight %-4d (frequency %7.3f %s)",
-                                    callsign, serial, flight, frequency, Altos.telemetry_name(telemetry));
+               return String.format("%-9.9s serial %-4d flight %-4d (%s %s)",
+                                    callsign, serial, flight, frequency.toShortString(), Altos.telemetry_name(telemetry));
        }
 
        public String toShortString() {
@@ -49,7 +49,7 @@ class AltosScanResult {
        }
 
        public AltosScanResult(String in_callsign, int in_serial,
-                              int in_flight, double in_frequency, int in_telemetry) {
+                              int in_flight, AltosFrequency in_frequency, int in_telemetry) {
                callsign = in_callsign;
                serial = in_serial;
                flight = in_flight;
@@ -61,7 +61,7 @@ class AltosScanResult {
                return (callsign.equals(other.callsign) &&
                        serial == other.serial &&
                        flight == other.flight &&
-                       frequency == other.frequency &&
+                       frequency.frequency == other.frequency.frequency &&
                        telemetry == other.telemetry);
        }
 }
@@ -115,11 +115,11 @@ public class AltosScanUI
        private JLabel                  telemetry_label;
        private JButton                 cancel_button;
        private JButton                 monitor_button;
+       private JCheckBox[]             telemetry_boxes;
        javax.swing.Timer               timer;
        AltosScanResults                results = new AltosScanResults();
 
        int                             telemetry;
-       double                          frequency;
 
        final static int                timeout = 1200;
        TelemetryHandler                handler;
@@ -130,8 +130,7 @@ public class AltosScanUI
        void scan_exception(Exception e) {
                if (e instanceof FileNotFoundException) {
                        JOptionPane.showMessageDialog(owner,
-                                                     String.format("Cannot open device \"%s\"",
-                                                                   device.toShortString()),
+                                                     ((FileNotFoundException) e).getMessage(),
                                                      "Cannot open target device",
                                                      JOptionPane.ERROR_MESSAGE);
                } else if (e instanceof AltosSerialInUseException) {
@@ -172,7 +171,7 @@ public class AltosScanUI
                                                        final AltosScanResult   result = new AltosScanResult(record.callsign,
                                                                                                     record.serial,
                                                                                                     record.flight,
-                                                                                                    frequency,
+                                                                                                    frequencies[frequency_index],
                                                                                                     telemetry);
                                                        Runnable r = new Runnable() {
                                                                        public void run() {
@@ -211,11 +210,15 @@ public class AltosScanUI
                reader.serial.set_monitor(false);
                Thread.sleep(100);
                ++frequency_index;
-               if (frequency_index >= frequencies.length) {
+               if (frequency_index >= frequencies.length ||
+                   !telemetry_boxes[telemetry - Altos.ao_telemetry_min].isSelected())
+               {
                        frequency_index = 0;
-                       ++telemetry;
-                       if (telemetry > Altos.ao_telemetry_max)
-                               telemetry = Altos.ao_telemetry_min;
+                       do {
+                               ++telemetry;
+                               if (telemetry > Altos.ao_telemetry_max)
+                                       telemetry = Altos.ao_telemetry_min;
+                       } while (!telemetry_boxes[telemetry - Altos.ao_telemetry_min].isSelected());
                        set_telemetry();
                }
                set_frequency();
@@ -252,6 +255,21 @@ public class AltosScanUI
                        if (cmd.equals("tick"))
                                tick_timer();
 
+                       if (cmd.equals("telemetry")) {
+                               int k;
+                               int scanning_telemetry = 0;
+                               for (k = Altos.ao_telemetry_min; k <= Altos.ao_telemetry_max; k++) {
+                                       int j = k - Altos.ao_telemetry_min;
+                                       if (telemetry_boxes[j].isSelected())
+                                               scanning_telemetry |= (1 << k);
+                               }
+                               if (scanning_telemetry == 0) {
+                                       scanning_telemetry |= (1 << Altos.ao_telemetry_standard);
+                                       telemetry_boxes[Altos.ao_telemetry_standard - Altos.ao_telemetry_min].setSelected(true);
+                               }
+                               AltosPreferences.set_scanning_telemetry(scanning_telemetry);
+                       }
+
                        if (cmd.equals("monitor")) {
                                close();
                                AltosScanResult r = (AltosScanResult) (list.getSelectedValue());
@@ -259,7 +277,8 @@ public class AltosScanUI
                                        if (device != null) {
                                                if (reader != null) {
                                                        reader.set_telemetry(r.telemetry);
-                                                       reader.set_frequency(r.frequency);
+                                                       reader.set_frequency(r.frequency.frequency);
+                                                       reader.save_frequency();
                                                        owner.telemetry_window(device);
                                                }
                                        }
@@ -306,8 +325,7 @@ public class AltosScanUI
                        return true;
                } catch (FileNotFoundException ee) {
                        JOptionPane.showMessageDialog(owner,
-                                                     String.format("Cannot open device \"%s\"",
-                                                                   device.toShortString()),
+                                                     ee.getMessage(),
                                                      "Cannot open target device",
                                                      JOptionPane.ERROR_MESSAGE);
                } catch (AltosSerialInUseException si) {
@@ -366,7 +384,7 @@ public class AltosScanUI
                
                set_label();
 
-               c.fill = GridBagConstraints.NONE;
+               c.fill = GridBagConstraints.HORIZONTAL;
                c.anchor = GridBagConstraints.WEST;
                c.insets = i;
                c.weightx = 1;
@@ -382,6 +400,20 @@ public class AltosScanUI
                c.gridy = 2;
                pane.add(telemetry_label, c);
 
+               int     scanning_telemetry = AltosPreferences.scanning_telemetry();
+               telemetry_boxes = new JCheckBox[Altos.ao_telemetry_max - Altos.ao_telemetry_min + 1];
+               for (int k = Altos.ao_telemetry_min; k <= Altos.ao_telemetry_max; k++) {
+                       int j = k - Altos.ao_telemetry_min;
+                       telemetry_boxes[j] = new JCheckBox(Altos.ao_telemetry_name[k]);
+                       c.gridy = 3 + j;
+                       pane.add(telemetry_boxes[j], c);
+                       telemetry_boxes[j].setActionCommand("telemetry");
+                       telemetry_boxes[j].addActionListener(this);
+                       telemetry_boxes[j].setSelected((scanning_telemetry & (1 << k)) != 0);
+               }
+
+               int     y_offset = 3 + (Altos.ao_telemetry_max - Altos.ao_telemetry_min + 1);
+                               
                list = new JList(results) {
                                //Subclass JList to workaround bug 4832765, which can cause the
                                //scroll pane to not let the user easily scroll up to the beginning
@@ -448,7 +480,7 @@ public class AltosScanUI
                c.weighty = 1;
 
                c.gridx = 0;
-               c.gridy = 3;
+               c.gridy = y_offset;
                c.gridwidth = 2;
                c.anchor = GridBagConstraints.CENTER;
 
@@ -465,7 +497,7 @@ public class AltosScanUI
                c.weighty = 1;
 
                c.gridx = 0;
-               c.gridy = 4;
+               c.gridy = y_offset + 1;
                c.gridwidth = 1;
                c.anchor = GridBagConstraints.CENTER;
 
@@ -482,7 +514,7 @@ public class AltosScanUI
                c.weighty = 1;
 
                c.gridx = 1;
-               c.gridy = 4;
+               c.gridy = y_offset + 1;
                c.gridwidth = 1;
                c.anchor = GridBagConstraints.CENTER;