first cut at turnon scripts for EasyTimer v2

[fw/altos] / altoslib / AltosPressure.java

diff --git a/altoslib/AltosPressure.java b/altoslib/AltosPressure.java
index 2de2682059424ae421b6d10a078b9278601fe8cf..97fd5de9dc22d5911045db7bc200cde379529d3b 100644 (file)
--- a/altoslib/AltosPressure.java
+++ b/altoslib/AltosPressure.java
@@ -16,35 +16,35 @@
  * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA.
  */
 
-package org.altusmetrum.altoslib_11;
+package org.altusmetrum.altoslib_14;
 
 public class AltosPressure extends AltosUnits {
 
        public double value(double v, boolean imperial_units) {
                if (imperial_units)
                        return AltosConvert.pa_to_psi(v);
-               return v;
+               return v / 1000.0;
        }
 
        public double inverse(double v, boolean imperial_units) {
                if (imperial_units)
                        return AltosConvert.psi_to_pa(v);
-               return v;
+               return v * 1000.0;
        }
 
        public String show_units(boolean imperial_units) {
                if (imperial_units)
                        return "psi";
-               return "Pa";
+               return "kPa";
        }
 
        public String say_units(boolean imperial_units) {
                if (imperial_units)
                        return "p s i";
-               return "pascals";
+               return "kilopascals";
        }
 
        public int show_fraction(int width, boolean imperial_units) {
-               return width / 9;
+               return width / 5;
        }
 }