From 73d87a2bd5b68db7901f1710670e746b7a1b9c65 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Wed, 16 May 2012 06:36:58 +0000 Subject: [PATCH] Added UNITS_WINDSPEED so the preferred units for entering wind speed can be configured separately from rocket velocities. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@689 180e2498-e6e9-4542-8430-84ac67f01cd8 --- core/resources/l10n/messages.properties | 1 + .../gui/dialogs/preferences/PreferencesDialog.java | 7 ++++++- .../net/sf/openrocket/gui/main/SimulationEditDialog.java | 4 ++-- core/src/net/sf/openrocket/unit/UnitGroup.java | 7 +++++++ 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/core/resources/l10n/messages.properties b/core/resources/l10n/messages.properties index 79f7a90a..cfc73792 100644 --- a/core/resources/l10n/messages.properties +++ b/core/resources/l10n/messages.properties @@ -230,6 +230,7 @@ pref.dlg.tab.Miscellaneousoptions = Miscellaneous options pref.dlg.lbl.Positiontoinsert = Position to insert new body components: pref.dlg.lbl.Confirmdeletion = Confirm deletion of simulations: pref.dlg.lbl.User-definedthrust = User-defined thrust curves: +pref.dlg.lbl.Windspeed = Windspeed pref.dlg.Allthrustcurvefiles = All thrust curve files (*.eng; *.rse; *.zip; directories) pref.dlg.RASPfiles = RASP motor files (*.eng) pref.dlg.RockSimfiles = RockSim engine files (*.rse) diff --git a/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java b/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java index 986c4a40..a3d963ee 100644 --- a/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java +++ b/core/src/net/sf/openrocket/gui/dialogs/preferences/PreferencesDialog.java @@ -388,7 +388,6 @@ public class PreferencesDialog extends JDialog { combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_TEMPERATURE)); panel.add(combo, "sizegroup boxes, wrap"); - //// Moment of inertia: panel.add(new JLabel(trans.get("pref.dlg.lbl.Momentofinertia"))); combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_INERTIA)); @@ -403,10 +402,16 @@ public class PreferencesDialog extends JDialog { //// Stability: panel.add(new JLabel(trans.get("pref.dlg.lbl.Stability"))); combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_STABILITY)); + panel.add(combo, "sizegroup boxes"); + + //// Windspeed: + panel.add(new JLabel(trans.get("pref.dlg.lbl.Windspeed"))); + combo = new JComboBox(new DefaultUnitSelector(UnitGroup.UNITS_WINDSPEED)); panel.add(combo, "sizegroup boxes, wrap para"); + //// Default metric button JButton button = new JButton(trans.get("pref.dlg.but.defaultmetric")); button.addActionListener(new ActionListener() { diff --git a/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java b/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java index 2b5ca7e7..cb9e0d34 100644 --- a/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java +++ b/core/src/net/sf/openrocket/gui/main/SimulationEditDialog.java @@ -241,7 +241,7 @@ public class SimulationEditDialog extends JDialog { label.setToolTipText(tip); sub.add(label); - m = new DoubleModel(conditions, "WindSpeedAverage", UnitGroup.UNITS_VELOCITY, 0); + m = new DoubleModel(conditions, "WindSpeedAverage", UnitGroup.UNITS_WINDSPEED, 0); spin = new JSpinner(m.getSpinnerModel()); spin.setEditor(new SpinnerEditor(spin)); @@ -266,7 +266,7 @@ public class SimulationEditDialog extends JDialog { label.setToolTipText(tip); sub.add(label); - m = new DoubleModel(conditions, "WindSpeedDeviation", UnitGroup.UNITS_VELOCITY, 0); + m = new DoubleModel(conditions, "WindSpeedDeviation", UnitGroup.UNITS_WINDSPEED, 0); DoubleModel m2 = new DoubleModel(conditions, "WindSpeedAverage", 0.25, UnitGroup.UNITS_COEFFICIENT, 0); diff --git a/core/src/net/sf/openrocket/unit/UnitGroup.java b/core/src/net/sf/openrocket/unit/UnitGroup.java index dcd0003b..6f6c5033 100644 --- a/core/src/net/sf/openrocket/unit/UnitGroup.java +++ b/core/src/net/sf/openrocket/unit/UnitGroup.java @@ -37,6 +37,7 @@ public class UnitGroup { */ public static final UnitGroup UNITS_STABILITY_CALIBERS; public static final UnitGroup UNITS_VELOCITY; + public static final UnitGroup UNITS_WINDSPEED; public static final UnitGroup UNITS_ACCELERATION; public static final UnitGroup UNITS_MASS; public static final UnitGroup UNITS_INERTIA; @@ -128,6 +129,12 @@ public class UnitGroup { UNITS_VELOCITY.addUnit(new GeneralUnit(0.3048, "ft/s")); UNITS_VELOCITY.addUnit(new GeneralUnit(0.44704, "mph")); + UNITS_WINDSPEED = new UnitGroup(); + UNITS_WINDSPEED.addUnit(new GeneralUnit(1, "m/s")); + UNITS_WINDSPEED.addUnit(new GeneralUnit(1 / 3.6, "km/h")); + UNITS_WINDSPEED.addUnit(new GeneralUnit(0.3048, "ft/s")); + UNITS_WINDSPEED.addUnit(new GeneralUnit(0.44704, "mph")); + UNITS_ACCELERATION = new UnitGroup(); UNITS_ACCELERATION.addUnit(new GeneralUnit(1, "m/s" + SQUARED)); UNITS_ACCELERATION.addUnit(new GeneralUnit(0.3048, "ft/s" + SQUARED)); -- 2.30.2