altosui: Handle units in pyro config.

[fw/altos] / altoslib / AltosTemperature.java

diff --git a/altoslib/AltosTemperature.java b/altoslib/AltosTemperature.java
index 2749eac09dfdbd08ffc538be1097e1247b821fec..a636533f5e7c95c5cc639906c5d50bb0cbb19ba2 100644 (file)
--- a/altoslib/AltosTemperature.java
+++ b/altoslib/AltosTemperature.java
@@ -15,29 +15,35 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_1;
+package org.altusmetrum.altoslib_2;
 
 public class AltosTemperature extends AltosUnits {
 
-       public double value(double v) {
-               if (AltosConvert.imperial_units)
+       public double value(double v, boolean imperial_units) {
+               if (imperial_units)
                        return AltosConvert.c_to_f(v);
                return v;
        }
 
-       public String show_units() {
-               if (AltosConvert.imperial_units)
+       public double inverse(double v, boolean imperial_units) {
+               if (imperial_units)
+                       return AltosConvert.f_to_c(v);
+               return v;
+       }
+
+       public String show_units(boolean imperial_units) {
+               if (imperial_units)
                        return "°F";
                return "°C";
        }
 
-       public String say_units() {
-               if (AltosConvert.imperial_units)
+       public String say_units(boolean imperial_units) {
+               if (imperial_units)
                        return "degrees farenheit";
                return "degrees celsius";
        }
 
-       public int show_fraction(int width) {
+       public int show_fraction(int width, boolean imperial_units) {
                return width / 3;
        }
 }