Add cubic inch and cubic millimeter as volume units

[sw/motorsim] / src / com / billkuker / rocketry / motorsim / RocketScience.java

diff --git a/src/com/billkuker/rocketry/motorsim/RocketScience.java b/src/com/billkuker/rocketry/motorsim/RocketScience.java
index fb13ebb08da1fca7309c35dc598dd3244e96beb0..f552b99a10de207956acedca3daeffa030a0c1d3 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/RocketScience.java
+++ b/src/com/billkuker/rocketry/motorsim/RocketScience.java
@@ -1,10 +1,12 @@
 package com.billkuker.rocketry.motorsim;\r
 \r
+import java.lang.ref.WeakReference;\r
 import java.lang.reflect.Field;\r
 import java.lang.reflect.Modifier;\r
 import java.text.DecimalFormat;\r
 import java.text.NumberFormat;\r
 import java.util.HashSet;\r
+import java.util.Iterator;\r
 import java.util.Set;\r
 import java.util.prefs.Preferences;\r
 \r
@@ -16,9 +18,12 @@ import javax.measure.unit.SI;
 import javax.measure.unit.Unit;\r
 import javax.measure.unit.UnitFormat;\r
 \r
+import org.apache.log4j.Logger;\r
 import org.jscience.physics.amount.Amount;\r
 \r
 public class RocketScience {\r
+       private static final Logger log = Logger.getLogger(RocketScience.class);\r
+       \r
        public static Unit<Pressure> PSI = new ProductUnit<Pressure>(NonSI.POUND_FORCE.divide(NonSI.INCH.pow(2)));\r
        public static Unit<Impulse> NEWTON_SECOND = new ProductUnit<Impulse>(SI.NEWTON.times(SI.SECOND));\r
        public static Unit<Impulse> POUND_SECOND = new ProductUnit<Impulse>(NonSI.POUND_FORCE.times(SI.SECOND));\r
@@ -35,9 +40,19 @@ public class RocketScience {
        public interface Impulse extends Quantity {\r
                public static Unit<Impulse> UNIT = NEWTON_SECOND;\r
        }\r
+       \r
+       private static HashSet<WeakReference<UnitPreferenceListener>> prefListeners = new HashSet<WeakReference<UnitPreferenceListener>>();\r
+       public static interface UnitPreferenceListener{\r
+               public void preferredUnitsChanged();\r
+       }\r
+       public static void addUnitPreferenceListener(UnitPreferenceListener l){\r
+               prefListeners.add(new WeakReference<RocketScience.UnitPreferenceListener>(l));\r
+       }\r
 \r
        public static enum UnitPreference{\r
                SI(new Unit[]{\r
+                               javax.measure.unit.SI.METERS_PER_SECOND,\r
+                               javax.measure.unit.SI.MILLIMETER.pow(3),\r
                                javax.measure.unit.SI.MILLIMETER.pow(2),\r
                                javax.measure.unit.SI.MILLIMETER,\r
                                javax.measure.unit.SI.MILLIMETER.divide(javax.measure.unit.SI.SECOND),\r
@@ -47,6 +62,8 @@ public class RocketScience {
                                NEWTON_SECOND\r
                }),\r
                NONSI(new Unit[]{\r
+                               javax.measure.unit.NonSI.MILES_PER_HOUR,\r
+                               javax.measure.unit.NonSI.INCH.pow(3),\r
                                javax.measure.unit.NonSI.INCH.pow(2),\r
                                javax.measure.unit.NonSI.INCH,\r
                                javax.measure.unit.NonSI.POUND_FORCE,\r
@@ -69,9 +86,22 @@ public class RocketScience {
                }\r
                \r
                public static void setUnitPreference( final UnitPreference up ){\r
+                       if ( preference == up )\r
+                               return;\r
                        preference = up;\r
                        Preferences prefs = Preferences.userNodeForPackage(RocketScience.class);\r
                        prefs.put("PreferedUnits", up.toString());\r
+                       Iterator<WeakReference<UnitPreferenceListener>> weakIter = prefListeners.iterator();\r
+                       while (weakIter.hasNext()) {\r
+                               WeakReference<UnitPreferenceListener> weak = weakIter.next();\r
+                               UnitPreferenceListener l = weak.get();\r
+                               if (l != null) {\r
+                                       l.preferredUnitsChanged();\r
+                               } else {\r
+                                       log.debug("Weak reference to UPE is null");\r
+                                       weakIter.remove();\r
+                               }\r
+                       }\r
                }\r
                \r
                protected Set<Unit<?>> units = new HashSet<Unit<?>>();\r
@@ -114,11 +144,9 @@ public class RocketScience {
                        } catch (NoSuchFieldException e) {\r
                                e.printStackTrace();\r
                        } catch (IllegalArgumentException e) {\r
-                               // TODO Auto-generated catch block\r
-                               e.printStackTrace();\r
+                               log.error(e);\r
                        } catch (IllegalAccessException e) {\r
-                               // TODO Auto-generated catch block\r
-                               e.printStackTrace();\r
+                               log.error(e);\r
                        }\r
                        return null;\r
                }\r
@@ -131,6 +159,7 @@ public class RocketScience {
                return nf.format(a.doubleValue(a.getUnit())) + " " + a.getUnit();\r
        }\r
        \r
+       @SuppressWarnings("unchecked")\r
        public static <T extends Quantity> String ammountToRoundedString(Amount<T> a) {\r
                if (a == null)\r
                        return "Null";\r
@@ -139,6 +168,14 @@ public class RocketScience {
                double d = a.doubleValue(u);\r
 \r
                DecimalFormat df;\r
+               \r
+               if (u == SI.MILLIMETER && d > 1000.0) {\r
+                       u = (Unit<T>) SI.METER;\r
+                       d = d / 1000.0;\r
+               } else if (u == NonSI.INCH && d > 12.0) {\r
+                       u = (Unit<T>) NonSI.FOOT;\r
+                       d = d / 12.0;\r
+               }\r
 \r
                if (Math.abs(d) < 10.0) {\r
                        df = new DecimalFormat("#.##");\r