From ac66ee53b3eeb26acf9d695efcef34edac1c54ae Mon Sep 17 00:00:00 2001 From: Bill Kuker Date: Sat, 30 Oct 2010 18:12:12 +0000 Subject: [PATCH] Consolidating some to String methods in RocketScieence --- .../billkuker/rocketry/motorsim/visual/BurnPanel.java | 10 +++++----- gui/com/billkuker/rocketry/motorsim/visual/Chart.java | 2 +- gui/com/billkuker/rocketry/motorsim/visual/Editor.java | 4 ++-- .../motorsim/visual/workbench/MotorEditor.java | 2 +- src/com/billkuker/rocketry/motorsim/RocketScience.java | 8 +++++++- 5 files changed, 16 insertions(+), 10 deletions(-) diff --git a/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java b/gui/com/billkuker/rocketry/motorsim/visual/BurnPanel.java index a42aaa1..dad56f5 100644 --- 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")); text.add(new JLabel(percent + "% " + new String(new char[]{cl}) + "-" +Math.round(averageThrust.doubleValue(SI.NEWTON)))); - text.add(new JLabel(RocketScience.approx(ns))); - text.add(new JLabel(RocketScience.approx(isp))); - text.add(new JLabel(RocketScience.approx(maxThrust))); - text.add(new JLabel(RocketScience.approx(averageThrust))); - text.add(new JLabel(RocketScience.approx(maxPressure))); + text.add(new JLabel(RocketScience.ammountToRoundedString(ns))); + text.add(new JLabel(RocketScience.ammountToRoundedString(isp))); + text.add(new JLabel(RocketScience.ammountToRoundedString(maxThrust))); + text.add(new JLabel(RocketScience.ammountToRoundedString(averageThrust))); + text.add(new JLabel(RocketScience.ammountToRoundedString(maxPressure))); add(text, BorderLayout.NORTH); diff --git a/gui/com/billkuker/rocketry/motorsim/visual/Chart.java b/gui/com/billkuker/rocketry/motorsim/visual/Chart.java index 97eb6df..ffaf72e 100644 --- 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 extends JPanel { Amount val = getNear(m); if ( val != null ) - marker.setLabel(RocketScience.approx(val)); + marker.setLabel(RocketScience.ammountToRoundedString(val)); marker.setLabelTextAnchor(TextAnchor.TOP_LEFT); marker.setLabelOffset(new RectangleInsets(0,-5,0,0)); diff --git a/gui/com/billkuker/rocketry/motorsim/visual/Editor.java b/gui/com/billkuker/rocketry/motorsim/visual/Editor.java index 11ddd8e..93e3293 100644 --- 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; import com.billkuker.rocketry.motorsim.CylindricalChamber; +import com.billkuker.rocketry.motorsim.RocketScience; import com.l2fprod.common.propertysheet.PropertySheetPanel; public class Editor extends PropertySheetPanel { @@ -114,8 +115,7 @@ public class Editor extends PropertySheetPanel { public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) { - Amount a = (Amount)value; - return new JLabel(nf.format(a.doubleValue(a.getUnit())) + " " + a.getUnit() ); + return new JLabel(RocketScience.ammountToString((Amount)value)); } } diff --git a/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java b/gui/com/billkuker/rocketry/motorsim/visual/workbench/MotorEditor.java index 2e7ecbe..dcea554 100644 --- 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 web = motor.getGrain().webThickness(); Amount remaining = web.times(1.0 - f); - progress.setText("Progress: " + pct + "% (" + RocketScience.approx(remaining) + " web thickness remaining)"); + progress.setText("Progress: " + pct + "% (" + RocketScience.ammountToRoundedString(remaining) + " web thickness remaining)"); if ( currentThread != me ){ throw new BurnCanceled(); } diff --git a/src/com/billkuker/rocketry/motorsim/RocketScience.java b/src/com/billkuker/rocketry/motorsim/RocketScience.java index ecb2e5b..a9a36d8 100644 --- 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; import java.text.DecimalFormat; +import java.text.NumberFormat; import java.util.HashSet; import java.util.Set; import java.util.prefs.Preferences; @@ -86,7 +87,12 @@ public class RocketScience { } } - public static String approx(Amount a) { + public static String toString(Amount a) { + final NumberFormat nf = new DecimalFormat("##########.###"); + return nf.format(a.doubleValue(a.getUnit())) + " " + a.getUnit(); + } + + public static String ammountToRoundedString(Amount a) { if (a == null) return "NULL"; Unit u = RocketScience.UnitPreference.preference.getPreferredUnit(a -- 2.30.2