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 b92f63cb4887ac6ad8e8bcb1be27e45ad1114201..f552b99a10de207956acedca3daeffa030a0c1d3 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/RocketScience.java
+++ b/src/com/billkuker/rocketry/motorsim/RocketScience.java
@@ -51,6 +51,8 @@ public class RocketScience {
 \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
@@ -60,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
@@ -140,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
@@ -157,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
@@ -165,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