From 6dc3337eafc9423cf066e1280c5767549293cc2f Mon Sep 17 00:00:00 2001 From: SiboVG Date: Mon, 7 Mar 2022 23:37:19 +0100 Subject: [PATCH 1/3] Use linear Cd override slider Previously, a logarithmic slider was used, which is confusing... --- .../openrocket/gui/configdialog/RocketComponentConfig.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java index 66c94148e..290c4ca39 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java @@ -384,12 +384,12 @@ public class RocketComponentConfig extends JPanel { //END OVERRIDES CG --------------------------------------------------- - //BEGIN OVERRIDES CD --------------------------------------------------- + //BEGIN OVERRIDES CD --------------------------------------------------- bm = new BooleanModel(component, "CDOverridden"); check = new JCheckBox(bm); - //// Override mass: + //// Override coefficient of drag: check.setText(trans.get("RocketCompCfg.checkbox.SetDragCoeff")); panel.add(check, "growx 1, gapright 20lp"); @@ -402,7 +402,7 @@ public class RocketComponentConfig extends JPanel { panel.add(spin, "growx 1"); - bs = new BasicSlider(m.getSliderModel(0, 0.01, 1.0)); + bs = new BasicSlider(m.getSliderModel(0, 1.0)); bm.addEnableComponent(bs); panel.add(bs, "growx 5, w 100lp, wrap"); From 0511bbda4fb9c9cc81db66dcd142f3f6e5cbde0d Mon Sep 17 00:00:00 2001 From: SiboVG Date: Mon, 7 Mar 2022 23:38:15 +0100 Subject: [PATCH 2/3] Change Cd slider UnitGroup to coefficient --- .../sf/openrocket/gui/configdialog/RocketComponentConfig.java | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java index 290c4ca39..88f7457f7 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java @@ -393,8 +393,7 @@ public class RocketComponentConfig extends JPanel { check.setText(trans.get("RocketCompCfg.checkbox.SetDragCoeff")); panel.add(check, "growx 1, gapright 20lp"); - m = new DoubleModel(component, "OverrideCD", UnitGroup.UNITS_NONE, 0); - + m = new DoubleModel(component, "OverrideCD", UnitGroup.UNITS_COEFFICIENT, 0); spin = new JSpinner(m.getSpinnerModel()); spin.setEditor(new SpinnerEditor(spin)); From 336acb037f66b7edfafc9feed5cdb2a26188942d Mon Sep 17 00:00:00 2001 From: SiboVG Date: Mon, 7 Mar 2022 23:38:53 +0100 Subject: [PATCH 3/3] Fix Override layout Switches the override subcomponent checkbox before the override Cd checkbox + puts the textual info on the bottom --- .../configdialog/RocketComponentConfig.java | 29 +++++++++---------- 1 file changed, 13 insertions(+), 16 deletions(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java index 88f7457f7..8ddee839a 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java @@ -378,11 +378,18 @@ public class RocketComponentConfig extends JPanel { bs = new BasicSlider(m.getSliderModel(new DoubleModel(0), length)); bm.addEnableComponent(bs); - panel.add(bs, "growx 5, w 100lp, wrap 35lp"); + panel.add(bs, "growx 5, w 100lp, wrap"); //END OVERRIDES CG --------------------------------------------------- + // Override subcomponents checkbox + bm = new BooleanModel(component, "OverrideSubcomponents"); + check = new JCheckBox(bm); + //// Override mass and CG of all subcomponents + check.setText(trans.get("RocketCompCfg.checkbox.OverridemassandCG")); + panel.add(check, "spanx, wrap 35lp"); + //BEGIN OVERRIDES CD --------------------------------------------------- @@ -408,22 +415,12 @@ public class RocketComponentConfig extends JPanel { //END OVERRIDES CP -------------------------------------------------- - - - - // Override subcomponents checkbox - bm = new BooleanModel(component, "OverrideSubcomponents"); - check = new JCheckBox(bm); - //// Override mass and CG of all subcomponents - check.setText(trans.get("RocketCompCfg.checkbox.OverridemassandCG")); - panel.add(check, "gap para, spanx, wrap para"); - - //// The overridden mass does not include motors.
+ //// The overridden mass does not include motors. panel.add(new StyledLabel(trans.get("RocketCompCfg.lbl.longB1") + - //// The center of gravity is measured from the front end of the - trans.get("RocketCompCfg.lbl.longB2") + " " + - component.getComponentName().toLowerCase(Locale.getDefault()) + ".", -1), - "spanx, wrap, gap para, height 0::30lp"); + //// The center of gravity is measured from the front end of the + trans.get("RocketCompCfg.lbl.longB2") + " " + + component.getComponentName().toLowerCase(Locale.getDefault()) + ".", -1), + "spanx, pushy, aligny bottom"); return panel; }