X-Git-Url: https://git.gag.com/?p=fw%2Faltos;a=blobdiff_plain;f=altoslib%2FAltosHeight.java;h=84bd42d91589e1324bf1cb5dc825e5f9ca488269;hp=1d2e4dbce499562d9db2a4d73df41efed1454d70;hb=82b42935d047d2f7c2f7a63a3efb72a3f1d5594e;hpb=5b976a6651f4eb05d30afc08b9e1f27c7e52ae00

diff --git a/altoslib/AltosHeight.java b/altoslib/AltosHeight.java
index 1d2e4dbc..84bd42d9 100644
--- a/altoslib/AltosHeight.java
+++ b/altoslib/AltosHeight.java
@@ -19,32 +19,31 @@ package org.altusmetrum.altoslib_2;
 
 public class AltosHeight extends AltosUnits {
 
-	public double value(double v) {
-		if (AltosConvert.imperial_units)
+	public double value(double v, boolean imperial_units) {
+		if (imperial_units)
 			return AltosConvert.meters_to_feet(v);
 		return v;
 	}
 
-	public double parse(String s) throws NumberFormatException {
-		double	v = Double.parseDouble(s);
-		if (AltosConvert.imperial_units)
-			v = AltosConvert.feet_to_meters(v);
+	public double inverse(double v, boolean imperial_units) {
+		if (imperial_units)
+			return AltosConvert.feet_to_meters(v);
 		return v;
 	}
 
-	public String show_units() {
-		if (AltosConvert.imperial_units)
+	public String show_units(boolean imperial_units) {
+		if (imperial_units)
 			return "ft";
 		return "m";
 	}
 
-	public String say_units() {
-		if (AltosConvert.imperial_units)
+	public String say_units(boolean imperial_units) {
+		if (imperial_units)
 			return "feet";
 		return "meters";
 	}
 
-	public int show_fraction(int width) {
+	public int show_fraction(int width, boolean imperial_units) {
 		return width / 9;
 	}
 }
\ No newline at end of file