From: Keith Packard <keithp@keithp.com>
Date: Mon, 14 Jul 2014 09:32:03 +0000 (-0700)
Subject: altosuilib: Fix minor scan UI nits
X-Git-Tag: 1.4.9.3~23^2~2
X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=commitdiff_plain;h=fb914d37018a585a879161483609d3c0be556d1e;hp=54b58e925e27e87bf2903678f87b7544ee2e8167

altosuilib: Fix minor scan UI nits

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>
---

diff --git a/altosuilib/AltosScanUI.java b/altosuilib/AltosScanUI.java
index 7b5f2c7e..7e51a55a 100644
--- a/altosuilib/AltosScanUI.java
+++ b/altosuilib/AltosScanUI.java
@@ -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) {