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

[fix][partial] Address some BodyTubeConfig instances of issue #329

Browse Source
This commit is contained in:
Daniel_M_Williams 2018-09-30 12:15:06 -04:00
parent 09fca29aab
commit 20318fde5c
1 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

28
swing/src/net/sf/openrocket/gui/configdialog/BodyTubeConfig.java
View File

@ -50,9 +50,9 @@ public class BodyTubeConfig extends RocketComponentConfig {
//// Body tube diameter //// Body tube diameter
panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Outerdiameter"))); panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Outerdiameter")));
DoubleModel od = new DoubleModel(component, "OuterRadius", 2, UnitGroup.UNITS_LENGTH, 0);
// Diameter = 2*Radius // Diameter = 2*Radius
final DoubleModel od = new DoubleModel(component, "OuterRadius", 2, UnitGroup.UNITS_LENGTH, 0);
component.addChangeListener(od);
spin = new JSpinner(od.getSpinnerModel()); spin = new JSpinner(od.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); spin.setEditor(new SpinnerEditor(spin));
panel.add(spin, "growx"); panel.add(spin, "growx");
@ -60,38 +60,38 @@ public class BodyTubeConfig extends RocketComponentConfig {
panel.add(new UnitSelector(od), "growx"); panel.add(new UnitSelector(od), "growx");
panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap 0px"); panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap 0px");
JCheckBox check = new JCheckBox(od.getAutomaticAction());
//// Automatic //// Automatic
javax.swing.Action outerAutoAction = od.getAutomaticAction();
JCheckBox check = new JCheckBox(outerAutoAction);
check.setText(trans.get("BodyTubecfg.checkbox.Automatic")); check.setText(trans.get("BodyTubecfg.checkbox.Automatic"));
panel.add(check, "skip, span 2, wrap"); panel.add(check, "skip, span 2, wrap");
//// Inner diameter //// Inner diameter
panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Innerdiameter"))); panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Innerdiameter")));
// Diameter = 2*Radius // Diameter = 2*Radius
DoubleModel m = new DoubleModel(component, "InnerRadius", 2, UnitGroup.UNITS_LENGTH, 0); final DoubleModel innerRadiusModel = new DoubleModel(component, "InnerRadius", 2, UnitGroup.UNITS_LENGTH, 0);
component.addChangeListener(innerRadiusModel);
spin = new JSpinner(innerRadiusModel.getSpinnerModel());
spin = new JSpinner(m.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); spin.setEditor(new SpinnerEditor(spin));
panel.add(spin, "growx"); panel.add(spin, "growx");
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(innerRadiusModel), "growx");
panel.add(new BasicSlider(m.getSliderModel(new DoubleModel(0), od)), "w 100lp, wrap"); panel.add(new BasicSlider(innerRadiusModel.getSliderModel(new DoubleModel(0), od)), "w 100lp, wrap");
//// Wall thickness //// Wall thickness
panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Wallthickness"))); panel.add(new JLabel(trans.get("BodyTubecfg.lbl.Wallthickness")));
m = new DoubleModel(component, "Thickness", UnitGroup.UNITS_LENGTH, 0); final DoubleModel thicknessModel = new DoubleModel(component, "Thickness", UnitGroup.UNITS_LENGTH, 0);
component.addChangeListener(thicknessModel);
spin = new JSpinner(m.getSpinnerModel()); spin = new JSpinner(thicknessModel.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); spin.setEditor(new SpinnerEditor(spin));
panel.add(spin, "growx"); panel.add(spin, "growx");
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(thicknessModel), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap 0px"); panel.add(new BasicSlider(thicknessModel.getSliderModel(0, 0.01)), "w 100lp, wrap 0px");
//// Filled //// Filled
check = new JCheckBox(new BooleanModel(component, "Filled")); check = new JCheckBox(new BooleanModel(component, "Filled"));