From 33fbfaef18c3f84974a2b7958840bba5275d45b5 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 6 Sep 2023 21:49:22 +0200 Subject: [PATCH] Fix PR #2134 --- core/src/net/sf/openrocket/unit/UnitGroup.java | 6 +++++- .../net/sf/openrocket/gui/configdialog/NoseConeConfig.java | 2 +- .../sf/openrocket/gui/configdialog/TransitionConfig.java | 2 +- 3 files changed, 7 insertions(+), 3 deletions(-) diff --git a/core/src/net/sf/openrocket/unit/UnitGroup.java b/core/src/net/sf/openrocket/unit/UnitGroup.java index 6d0c5ba4d..090b5ec49 100644 --- a/core/src/net/sf/openrocket/unit/UnitGroup.java +++ b/core/src/net/sf/openrocket/unit/UnitGroup.java @@ -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(); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java index 20039eaa3..aea73a9e1 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/NoseConeConfig.java @@ -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)); diff --git a/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java index abe6fceab..dc393d4d4 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/TransitionConfig.java @@ -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));