hongshaorou/openrocket
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix PR #2134

Browse Source
This commit is contained in:
SiboVG 2023-09-06 21:49:22 +02:00
parent ff8731e164
commit 33fbfaef18
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
core/src/net/sf/openrocket/unit/UnitGroup.java
View File

@ -36,6 +36,7 @@ public class UnitGroup {
public static final UnitGroup UNITS_LENGTH;
public static final UnitGroup UNITS_ALL_LENGTHS;
public static final UnitGroup UNITS_DISTANCE;
public static final UnitGroup UNITS_SHAPE_PARAMETER;
public static final UnitGroup UNITS_AREA;
public static final UnitGroup UNITS_STABILITY;
@ -127,7 +128,7 @@ public class UnitGroup {
UNITS_LENGTH.addUnit(new GeneralUnit(0.001, "mm"));
UNITS_LENGTH.addUnit(new GeneralUnit(0.01, "cm"));
UNITS_LENGTH.addUnit(new GeneralUnit(1, "m"));
UNITS_LENGTH.addUnit(new InchUnit(0.0254, "in", 0.1));
UNITS_LENGTH.addUnit(new InchUnit(0.0254, "in", 1));
UNITS_LENGTH.addUnit(new FractionalUnit(0.0254, "in/64", "in", 64, 1d / 16d, 0.5d / 64d));
UNITS_LENGTH.addUnit(new GeneralUnit(0.3048, "ft"));
@ -163,6 +164,9 @@ public class UnitGroup {
UNITS_AREA.addUnit(new GeneralUnit(1, "m" + SQUARED));
UNITS_AREA.addUnit(new GeneralUnit(pow2(0.0254), "in" + SQUARED));
UNITS_AREA.addUnit(new GeneralUnit(pow2(0.3048), "ft" + SQUARED));
UNITS_SHAPE_PARAMETER = new UnitGroup();
UNITS_SHAPE_PARAMETER.addUnit(new FixedPrecisionUnit("" + ZWSP, 0.1)); // zero-width space
UNITS_STABILITY = new UnitGroup();

2
swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java
View File

@ -76,7 +76,7 @@ public class NoseConeConfig extends RocketComponentConfig {
this.shapeLabel = new JLabel(trans.get("NoseConeCfg.lbl.Shapeparam"));
panel.add(shapeLabel);
final DoubleModel parameterModel = new DoubleModel(component, "ShapeParameter");
final DoubleModel parameterModel = new DoubleModel(component, "ShapeParameter", UnitGroup.UNITS_SHAPE_PARAMETER, 0, 1);
this.shapeSpinner = new JSpinner(parameterModel.getSpinnerModel());
shapeSpinner.setEditor(new SpinnerEditor(shapeSpinner));

2
swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java
View File

@ -83,7 +83,7 @@ public class TransitionConfig extends RocketComponentConfig {
this.shapeLabel = new JLabel(trans.get("TransitionCfg.lbl.Shapeparam"));
panel.add(shapeLabel);
final DoubleModel shapeModel = new DoubleModel(component, "ShapeParameter");
final DoubleModel shapeModel = new DoubleModel(component, "ShapeParameter", UnitGroup.UNITS_SHAPE_PARAMETER, 0, 1);
this.shapeSpinner = new JSpinner(shapeModel.getSpinnerModel());
shapeSpinner.setEditor(new SpinnerEditor(shapeSpinner));