altosui: Handle units in pyro config.

[fw/altos] / altoslib / AltosAccel.java

diff --git a/altoslib/AltosAccel.java b/altoslib/AltosAccel.java
index 08eba359c9f6bfb4622be0344d2b957390c8aead..b838d30b23e815581f0d038bff783d6658e4574b 100644 (file)
--- a/altoslib/AltosAccel.java
+++ b/altoslib/AltosAccel.java
@@ -19,25 +19,31 @@ package org.altusmetrum.altoslib_2;
 
 public class AltosAccel extends AltosUnits {
 
 
 public class AltosAccel 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;
        }
 
                        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/s²";
                return "m/s²";
        }
 
                        return "ft/s²";
                return "m/s²";
        }
 

-       public String say_units() {
-               if (AltosConvert.imperial_units)
+       public String say_units(boolean imperial_units) {
+               if (imperial_units)

                        return "feet per second squared";
                return "meters per second squared";
        }
 
                        return "feet per second squared";
                return "meters per second squared";
        }
 

-       public int show_fraction(int width) {
+       public int show_fraction(int width, boolean imperial_units) {

                return width / 9;
        }
 }
\ No newline at end of file
                return width / 9;
        }
 }
\ No newline at end of file