altosui: Use preferred units for main deployment height configuration

Show and accept values in the preferred units; create a separate list
of preferred values for each set of units

Signed-off-by: Keith Packard <keithp@keithp.com>

2 files changed, 11 insertions, 0 deletions

diff --git a/altoslib/AltosConvert.java b/altoslib/AltosConvert.java
index a42b36c4..8cd478e2 100644
--- a/altoslib/AltosConvert.java
+++ b/altoslib/AltosConvert.java
@@ -242,6 +242,10 @@ public class AltosConvert {
 		return meters * (100 / (2.54 * 12));
 	}
 
+	public static double feet_to_meters(double feet) {
+		return feet * 12 * 2.54 / 100.0;
+	}
+
 	public static double meters_to_miles(double meters) {
 		return meters_to_feet(meters) / 5280;
 	}
diff --git a/altoslib/AltosHeight.java b/altoslib/AltosHeight.java
index ed590812..96f5722b 100644
--- a/altoslib/AltosHeight.java
+++ b/altoslib/AltosHeight.java
@@ -25,6 +25,13 @@ public class AltosHeight extends AltosUnits {
 		return v;
 	}
 
+	public double parse(String s) throws NumberFormatException {
+		double	v = Double.parseDouble(s);
+		if (AltosConvert.imperial_units)
+			v = AltosConvert.feet_to_meters(v);
+		return v;
+	}
+
 	public String show_units() {
 		if (AltosConvert.imperial_units)
 			return "ft";