altosuilib: Fix minor scan UI nits
authorKeith Packard <keithp@keithp.com>
Mon, 14 Jul 2014 09:32:03 +0000 (02:32 -0700)
committerKeith Packard <keithp@keithp.com>
Mon, 14 Jul 2014 09:32:03 +0000 (02:32 -0700)
Wasn't computing geometry correctly and overlapped the 2400 baud entry
with the list of scan results.

Was not saving the telemetry rate/telemetry style when switching to
monitor mode, which caused the new monitor to come up with the wrong values.

Signed-off-by: Keith Packard <keithp@keithp.com>
altosuilib/AltosScanUI.java

index 7b5f2c7e64b88a7730b1db46d5a85757695f2f6a..7e51a55a757d174d8dce0a1ac6566cefbbaf5d8d 100644 (file)
@@ -356,10 +356,13 @@ public class AltosScanUI
                                if (r != null) {
                                        if (device != null) {
                                                if (reader != null) {
+                                                       System.out.printf("frequency %g rate %d\n", r.frequency.frequency, r.rate);
                                                        reader.set_telemetry(r.telemetry);
                                                        reader.set_telemetry_rate(r.rate);
                                                        reader.set_frequency(r.frequency.frequency);
                                                        reader.save_frequency();
+                                                       reader.save_telemetry();
+                                                       reader.save_telemetry_rate();
                                                        owner.scan_device_selected(device);
                                                }
                                        }
@@ -519,7 +522,7 @@ public class AltosScanUI
                                rate_boxes[k].addActionListener(this);
                                rate_boxes[k].setSelected((scanning_rate & (1 << k)) != 0);
                        }
-                       y_offset_rate += AltosLib.ao_telemetry_rate_max;
+                       y_offset_rate += AltosLib.ao_telemetry_rate_max + 1;
                }
 
                if (select_telemetry) {