altosui: Handle units in pyro config.

[fw/altos] / altoslib / AltosAccel.java

diff --git a/altoslib/AltosAccel.java b/altoslib/AltosAccel.java
index d14764a2023829e6229de23bf3d1b838f3052fee..b838d30b23e815581f0d038bff783d6658e4574b 100644 (file)
--- a/altoslib/AltosAccel.java
+++ b/altoslib/AltosAccel.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 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;
        }
 
-       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²";
        }
 
-       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";
        }
 
-       int show_fraction(int width) {
+       public int show_fraction(int width, boolean imperial_units) {
                return width / 9;
        }
 }
\ No newline at end of file