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

Fix radial position tab of inner tube

Browse Source
This commit is contained in:
SiboVG 2023-01-10 23:20:03 +01:00
parent 30a2103645
commit 8386086ed7
2 changed files with 13 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
swing/src/net/sf/openrocket/gui/adaptors/DoubleModel.java
View File

@ -443,8 +443,14 @@ public class DoubleModel implements StateChangeListener, ChangeSource, Invalidat
fireStateChanged();
}
}
public BoundedRangeModel getSliderModel() {
if (minValue == Double.NEGATIVE_INFINITY || maxValue == Double.POSITIVE_INFINITY) {
throw new IllegalArgumentException("Cannot create slider model for unbounded range");
}
return new ValueSliderModel(minValue, maxValue);
}
public BoundedRangeModel getSliderModel(DoubleModel min, DoubleModel max) {
return new ValueSliderModel(min, max);
}

10
swing/src/net/sf/openrocket/gui/configdialog/InnerTubeConfig.java
View File

@ -215,7 +215,7 @@ public class InnerTubeConfig extends RocketComponentConfig {
}
protected JPanel positionTab() {
JPanel panel = new JPanel(new MigLayout("align 20% 20%, gap rel unrel",
JPanel panel = new JPanel(new MigLayout("gap rel unrel, ins 35",
"[][65lp::][30lp::]", ""));
//// Radial position
@ -237,7 +237,7 @@ public class InnerTubeConfig extends RocketComponentConfig {
BasicSlider bs = new BasicSlider(m.getSliderModel(0, 0.1, 1.0));
//// Distance from the rocket centerline
bs.setToolTipText(trans.get("ringcompcfg.Distancefrom"));
panel.add(bs, "w 100lp, wrap");
panel.add(bs, "w 130lp, wrap");
//// Radial direction
@ -259,7 +259,7 @@ public class InnerTubeConfig extends RocketComponentConfig {
bs = new BasicSlider(m.getSliderModel(-Math.PI, Math.PI));
//// The radial direction from the rocket centerline
bs.setToolTipText(trans.get("ringcompcfg.radialdirectionfrom"));
panel.add(bs, "w 100lp, wrap");
panel.add(bs, "w 130lp, wrap");
//// Reset button
@ -277,7 +277,7 @@ public class InnerTubeConfig extends RocketComponentConfig {
order.add(button);
DescriptionArea note = new DescriptionArea(3);
DescriptionArea note = new DescriptionArea(4);
//// Note: An inner tube will not affect the aerodynamics of the rocket even if located outside the body tube.
note.setText(trans.get("ringcompcfg.note.desc"));
panel.add(note, "spanx, growx");
@ -340,7 +340,7 @@ public class InnerTubeConfig extends RocketComponentConfig {
order.add(((SpinnerEditor) spin.getEditor()).getTextField());
subPanel.add(new UnitSelector(dm), "growx");
bs = new BasicSlider(dm.getSliderModel(-Math.PI, 0, Math.PI));
bs = new BasicSlider(dm.getSliderModel());
//// Rotation angle of the cluster configuration
bs.setToolTipText(trans.get("InnerTubeCfg.lbl.ttip.Rotation"));
subPanel.add(bs, "w 100lp, wrap para");