Consolidating some to String methods in RocketScieence

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
index a42aaa1ae947ab6e74f3762c962a8404d0159e52..dad56f511fed921847804a546b542636c7555b01 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java
@@ -139,11 +139,11 @@ public class BurnPanel extends JPanel {
                        text.add(new JLabel("Max Pressure"));\r
                        \r
                        text.add(new JLabel(percent + "% " + new String(new char[]{cl}) + "-" +Math.round(averageThrust.doubleValue(SI.NEWTON))));\r
-                       text.add(new JLabel(RocketScience.approx(ns)));\r
-                       text.add(new JLabel(RocketScience.approx(isp)));                        \r
-                       text.add(new JLabel(RocketScience.approx(maxThrust)));\r
-                       text.add(new JLabel(RocketScience.approx(averageThrust)));\r
-                       text.add(new JLabel(RocketScience.approx(maxPressure)));\r
+                       text.add(new JLabel(RocketScience.ammountToRoundedString(ns)));\r
+                       text.add(new JLabel(RocketScience.ammountToRoundedString(isp)));                        \r
+                       text.add(new JLabel(RocketScience.ammountToRoundedString(maxThrust)));\r
+                       text.add(new JLabel(RocketScience.ammountToRoundedString(averageThrust)));\r
+                       text.add(new JLabel(RocketScience.ammountToRoundedString(maxPressure)));\r
                        \r
                        add(text, BorderLayout.NORTH);\r
                        \r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/Chart.java b/gui/com/billkuker/rocketry/motorsim/visual/Chart.java
index 97eb6df2d9cb9684388840ca2c2357db5b6567ae..ffaf72e3d7a2c651686c9a437ea3413d4c07dc17 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/Chart.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/Chart.java
@@ -141,7 +141,7 @@ public class Chart<X extends Quantity, Y extends Quantity> extends JPanel {
                        \r
                        Amount<Y> val = getNear(m);\r
                        if ( val != null )\r
-                               marker.setLabel(RocketScience.approx(val));\r
+                               marker.setLabel(RocketScience.ammountToRoundedString(val));\r
                        \r
                        marker.setLabelTextAnchor(TextAnchor.TOP_LEFT);\r
                        marker.setLabelOffset(new RectangleInsets(0,-5,0,0));\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/Editor.java b/gui/com/billkuker/rocketry/motorsim/visual/Editor.java
index 11ddd8ea790620c389fd424442c05172a38869f2..93e32932ecf3aeca274ad73efbbb322dc0bf8b91 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/Editor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/Editor.java
@@ -26,6 +26,7 @@ import org.apache.log4j.Logger;
 import org.jscience.physics.amount.Amount;\r
 \r
 import com.billkuker.rocketry.motorsim.CylindricalChamber;\r
+import com.billkuker.rocketry.motorsim.RocketScience;\r
 import com.l2fprod.common.propertysheet.PropertySheetPanel;\r
 \r
 public class Editor extends PropertySheetPanel {\r
@@ -114,8 +115,7 @@ public class Editor extends PropertySheetPanel {
                public Component getTableCellRendererComponent(JTable table,\r
                                Object value, boolean isSelected, boolean hasFocus, int row,\r
                                int column) {\r
-                       Amount a = (Amount)value;\r
-                       return new JLabel(nf.format(a.doubleValue(a.getUnit())) + " " + a.getUnit() );\r
+                       return new JLabel(RocketScience.ammountToString((Amount<?>)value));\r
                }\r
                \r
        }\r

diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
index 2e7ecbed87eec700deb1beb1903ec7af0d436ddb..dcea55419256d73a2e2f31312f6e068f0270c13a 100644 (file)
--- a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
+++ b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java
@@ -152,7 +152,7 @@ public class MotorEditor extends JTabbedPane implements PropertyChangeListener {
                                                                                Amount<Length> web = motor.getGrain().webThickness();\r
                                                                                Amount<Length> remaining = web.times(1.0 - f);\r
                                                                                \r
-                                                                               progress.setText("Progress: " + pct + "% (" + RocketScience.approx(remaining) + " web thickness remaining)");\r
+                                                                               progress.setText("Progress: " + pct + "% (" + RocketScience.ammountToRoundedString(remaining) + " web thickness remaining)");\r
                                                                                if ( currentThread != me ){\r
                                                                                        throw new BurnCanceled();\r
                                                                                }\r

diff --git a/src/com/billkuker/rocketry/motorsim/RocketScience.java b/src/com/billkuker/rocketry/motorsim/RocketScience.java
index ecb2e5bd76f6d78ae82fb7ffe7a5908e488dee1c..a9a36d82083988a458272b0456f5386cb34f500c 100644 (file)
--- a/src/com/billkuker/rocketry/motorsim/RocketScience.java
+++ b/src/com/billkuker/rocketry/motorsim/RocketScience.java
@@ -1,6 +1,7 @@
 package com.billkuker.rocketry.motorsim;\r
 \r
 import java.text.DecimalFormat;\r
+import java.text.NumberFormat;\r
 import java.util.HashSet;\r
 import java.util.Set;\r
 import java.util.prefs.Preferences;\r
@@ -86,7 +87,12 @@ public class RocketScience {
                }\r
        }\r
 \r
-       public static <T extends Quantity> String approx(Amount<T> a) {\r
+       public static <T extends Quantity> String toString(Amount<T> a) {\r
+               final NumberFormat nf = new DecimalFormat("##########.###");\r
+               return nf.format(a.doubleValue(a.getUnit())) + " " + a.getUnit();\r
+       }\r
+       \r
+       public static <T extends Quantity> String ammountToRoundedString(Amount<T> a) {\r
                if (a == null)\r
                        return "NULL";\r
                Unit<T> u = RocketScience.UnitPreference.preference.getPreferredUnit(a\r