altosui: Handle units in pyro config.

[fw/altos] / altoslib / AltosHeight.java

diff --git a/altoslib/AltosHeight.java b/altoslib/AltosHeight.java
index d7192e0b6512d5dccf8c9e9150d70a8a810f19a7..84bd42d91589e1324bf1cb5dc825e5f9ca488269 100644 (file)
--- a/altoslib/AltosHeight.java
+++ b/altoslib/AltosHeight.java
@@ -15,29 +15,35 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib;
+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 String show_units() {
-               if (AltosConvert.imperial_units)
+       public double inverse(double v, boolean imperial_units) {
+               if (imperial_units)
+                       return AltosConvert.feet_to_meters(v);
+               return v;
+       }
+
+       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";
        }
 
-       int show_fraction(int width) {
+       public int show_fraction(int width, boolean imperial_units) {
                return width / 9;
        }
 }
\ No newline at end of file