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

[fix][partial] Address Some issues of TrapezoidFinSetConfig: isssue #329

Browse Source
This commit is contained in:
Daniel_M_Williams 2018-10-15 13:10:04 -04:00
parent 20318fde5c
commit f5d786fab6
1 changed files with 165 additions and 176 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

169
swing/src/net/sf/openrocket/gui/configdialog/TrapezoidFinSetConfig.java
View File

@ -33,9 +33,6 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
public TrapezoidFinSetConfig(OpenRocketDocument d, final RocketComponent component) { public TrapezoidFinSetConfig(OpenRocketDocument d, final RocketComponent component) {
super(d, component); super(d, component);
DoubleModel m;
JSpinner spin;
JPanel mainPanel = new JPanel(new MigLayout()); JPanel mainPanel = new JPanel(new MigLayout());
@ -47,125 +44,121 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
label.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Nbroffins")); label.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Nbroffins"));
panel.add(label); panel.add(label);
IntegerModel im = new IntegerModel(component, "FinCount", 1, 8); final IntegerModel finCountModel = new IntegerModel(component, "FinCount", 1, 8);
spin = new JSpinner(im.getSpinnerModel()); final JSpinner finCountSpinner = new JSpinner(finCountModel.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); finCountSpinner.setEditor(new SpinnerEditor(finCountSpinner));
//// The number of fins in the fin set. //// The number of fins in the fin set.
spin.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Nbroffins")); finCountSpinner.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Nbroffins"));
panel.add(spin, "growx, wrap"); panel.add(finCountSpinner, "growx, wrap");
//// Base rotation { /// Base rotation
//// Fin rotation:
label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Finrotation")); label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Finrotation"));
//// The angle of the first fin in the fin set. //// The angle of the first fin in the fin set.
label.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Finrotation")); label.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Finrotation"));
panel.add(label); panel.add(label);
m = new DoubleModel(component, "BaseRotation", UnitGroup.UNITS_ANGLE); final DoubleModel baseRotationModel = new DoubleModel(component, "BaseRotation", UnitGroup.UNITS_ANGLE);
spin = new JSpinner(m.getSpinnerModel()); final JSpinner baseRotationSpinner = new JSpinner(baseRotationModel.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); baseRotationSpinner.setEditor(new SpinnerEditor(baseRotationSpinner));
panel.add(spin, "growx"); panel.add(baseRotationSpinner, "growx");
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(baseRotationModel), "growx");
panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap"); panel.add(new BasicSlider(baseRotationModel.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
}
{//// Fin cant:
//// Fin cant:
label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Fincant")); label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Fincant"));
//// The angle that the fins are canted with respect to the rocket //// The angle that the fins are canted with respect to the rocket
label.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Fincant")); label.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Fincant"));
panel.add(label); panel.add(label);
m = new DoubleModel(component, "CantAngle", UnitGroup.UNITS_ANGLE, final DoubleModel cantModel = new DoubleModel(component, "CantAngle", UnitGroup.UNITS_ANGLE, -FinSet.MAX_CANT, FinSet.MAX_CANT);
-FinSet.MAX_CANT, FinSet.MAX_CANT);
spin = new JSpinner(m.getSpinnerModel()); final JSpinner cantSpinner = new JSpinner(cantModel.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); cantSpinner.setEditor(new SpinnerEditor(cantSpinner));
panel.add(spin, "growx"); panel.add(cantSpinner, "growx");
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(cantModel), "growx");
panel.add(new BasicSlider(m.getSliderModel(-FinSet.MAX_CANT, FinSet.MAX_CANT)), panel.add(new BasicSlider(cantModel.getSliderModel(-FinSet.MAX_CANT, FinSet.MAX_CANT)),
"w 100lp, wrap"); "w 100lp, wrap");
}
{//// Root chord:
//// Root chord:
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Rootchord"))); panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Rootchord")));
m = new DoubleModel(component, "RootChord", UnitGroup.UNITS_LENGTH, 0); final DoubleModel rootChordModel = new DoubleModel(component, "RootChord", UnitGroup.UNITS_LENGTH, 0);
spin = new JSpinner(m.getSpinnerModel()); final JSpinner rootChordSpinner = new JSpinner(rootChordModel.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); rootChordSpinner.setEditor(new SpinnerEditor(rootChordSpinner));
panel.add(spin, "growx"); panel.add(rootChordSpinner, "growx");
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(rootChordModel), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap"); panel.add(new BasicSlider(rootChordModel.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
}
{//// Tip chord:
//// Tip chord:
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Tipchord"))); panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Tipchord")));
m = new DoubleModel(component, "TipChord", UnitGroup.UNITS_LENGTH, 0); final DoubleModel tipChordModel = new DoubleModel(component, "TipChord", UnitGroup.UNITS_LENGTH, 0);
spin = new JSpinner(m.getSpinnerModel()); final JSpinner tipChordSpinner = new JSpinner(tipChordModel.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); tipChordSpinner.setEditor(new SpinnerEditor(tipChordSpinner));
panel.add(spin, "growx"); panel.add(tipChordSpinner, "growx");
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(tipChordModel), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap"); panel.add(new BasicSlider(tipChordModel.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
}
{//// Height:
//// Height:
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Height"))); panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Height")));
m = new DoubleModel(component, "Height", UnitGroup.UNITS_LENGTH, 0); final DoubleModel heightModel = new DoubleModel(component, "Height", UnitGroup.UNITS_LENGTH, 0);
spin = new JSpinner(m.getSpinnerModel()); final JSpinner heightSpinner = new JSpinner(heightModel.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); heightSpinner.setEditor(new SpinnerEditor(heightSpinner));
panel.add(spin, "growx"); panel.add(heightSpinner, "growx");
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(heightModel), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap"); panel.add(new BasicSlider(heightModel.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
}
{//// Sweep length:
//// Sweep length:
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Sweeplength"))); panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Sweeplength")));
m = new DoubleModel(component, "Sweep", UnitGroup.UNITS_LENGTH); final DoubleModel sweepDistanceModel = new DoubleModel(component, "Sweep", UnitGroup.UNITS_LENGTH);
component.addChangeListener(sweepDistanceModel);
final JSpinner sweepDistanceSpinner = new JSpinner(sweepDistanceModel.getSpinnerModel());
sweepDistanceSpinner.setEditor(new SpinnerEditor(sweepDistanceSpinner));
panel.add(sweepDistanceSpinner, "growx");
spin = new JSpinner(m.getSpinnerModel()); panel.add(new UnitSelector(sweepDistanceModel), "growx");
spin.setEditor(new SpinnerEditor(spin));
panel.add(spin, "growx");
panel.add(new UnitSelector(m), "growx");
// sweep slider from -1.1*TipChord to 1.1*RootChord // sweep slider from -1.1*TipChord to 1.1*RootChord
DoubleModel tc = new DoubleModel(component, "TipChord", -1.1, UnitGroup.UNITS_LENGTH); DoubleModel tc = new DoubleModel(component, "TipChord", -1.1, UnitGroup.UNITS_LENGTH);
DoubleModel rc = new DoubleModel(component, "RootChord", 1.1, UnitGroup.UNITS_LENGTH); DoubleModel rc = new DoubleModel(component, "RootChord", 1.1, UnitGroup.UNITS_LENGTH);
panel.add(new BasicSlider(m.getSliderModel(tc, rc)), "w 100lp, wrap"); panel.add(new BasicSlider(sweepDistanceModel.getSliderModel(tc, rc)), "w 100lp, wrap");
}
{//// Sweep angle:
//// Sweep angle:
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Sweepangle"))); panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Sweepangle")));
m = new DoubleModel(component, "SweepAngle", UnitGroup.UNITS_ANGLE, final DoubleModel sweepAngleModel = new DoubleModel(component, "SweepAngle", UnitGroup.UNITS_ANGLE,
-TrapezoidFinSet.MAX_SWEEP_ANGLE, TrapezoidFinSet.MAX_SWEEP_ANGLE); -TrapezoidFinSet.MAX_SWEEP_ANGLE, TrapezoidFinSet.MAX_SWEEP_ANGLE);
component.addChangeListener(sweepAngleModel);
spin = new JSpinner(m.getSpinnerModel()); final JSpinner sweepAngleSpinner = new JSpinner(sweepAngleModel.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); sweepAngleSpinner.setEditor(new SpinnerEditor(sweepAngleSpinner));
panel.add(spin, "growx"); panel.add(sweepAngleSpinner, "growx");
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(sweepAngleModel), "growx");
panel.add(new BasicSlider(m.getSliderModel(-Math.PI / 4, Math.PI / 4)), panel.add(new BasicSlider(sweepAngleModel.getSliderModel(-Math.PI / 4, Math.PI / 4)),
"w 100lp, wrap paragraph"); "w 100lp, wrap paragraph");
}
{//// Position relative to:
//// Position
//// Position relative to:
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Posrelativeto"))); panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Posrelativeto")));
final EnumModel<AxialMethod> methodModel = new EnumModel<AxialMethod>(component, "AxialMethod", AxialMethod.axialOffsetMethods); final EnumModel<AxialMethod> methodModel = new EnumModel<AxialMethod>(component, "AxialMethod", AxialMethod.axialOffsetMethods);
@ -175,32 +168,28 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
//// plus //// plus
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.plus")), "right"); panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.plus")), "right");
m = new DoubleModel(component, "AxialOffset", UnitGroup.UNITS_LENGTH); final DoubleModel axialOffsetModel = new DoubleModel(component, "AxialOffset", UnitGroup.UNITS_LENGTH);
spin = new JSpinner(m.getSpinnerModel()); final JSpinner axialOffsetSpinner = new JSpinner(axialOffsetModel.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); axialOffsetSpinner.setEditor(new SpinnerEditor(axialOffsetSpinner));
panel.add(spin, "growx"); panel.add(axialOffsetSpinner, "growx");
panel.add(new UnitSelector(m), "growx"); panel.add(new UnitSelector(axialOffsetModel), "growx");
panel.add(new BasicSlider(m.getSliderModel( panel.add(new BasicSlider(axialOffsetModel.getSliderModel(
new DoubleModel(component.getParent(), "Length", -1.0, UnitGroup.UNITS_NONE), new DoubleModel(component.getParent(), "Length", -1.0, UnitGroup.UNITS_NONE),
new DoubleModel(component.getParent(), "Length"))), new DoubleModel(component.getParent(), "Length"))),
"w 100lp, wrap para"); "w 100lp, wrap para");
mainPanel.add(panel, "aligny 20%"); mainPanel.add(panel, "aligny 20%");
mainPanel.add(new JSeparator(SwingConstants.VERTICAL), "growy"); mainPanel.add(new JSeparator(SwingConstants.VERTICAL), "growy");
}
panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", "")); panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
{//// Fin cross section:
//// Fin cross section:
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.FincrossSection"))); panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.FincrossSection")));
JComboBox<FinSet.CrossSection> sectionCombo = new JComboBox<FinSet.CrossSection>( JComboBox<FinSet.CrossSection> sectionCombo = new JComboBox<FinSet.CrossSection>(
new EnumModel<FinSet.CrossSection>(component, "CrossSection")); new EnumModel<FinSet.CrossSection>(component, "CrossSection"));
@ -210,15 +199,15 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
//// Thickness: //// Thickness:
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Thickness"))); panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Thickness")));
m = new DoubleModel(component, "Thickness", UnitGroup.UNITS_LENGTH, 0); final DoubleModel thicknessModel = new DoubleModel(component, "Thickness", UnitGroup.UNITS_LENGTH, 0);
spin = new JSpinner(m.getSpinnerModel()); final JSpinner thicknessSpinner = new JSpinner(thicknessModel.getSpinnerModel());
spin.setEditor(new SpinnerEditor(spin)); thicknessSpinner.setEditor(new SpinnerEditor(thicknessSpinner));
panel.add(spin, "growx"); panel.add(thicknessSpinner, "growx");
panel.add(new UnitSelector(m), "growx");
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap para");
panel.add(new UnitSelector(thicknessModel), "growx");
panel.add(new BasicSlider(thicknessModel.getSliderModel(0, 0.01)), "w 100lp, wrap para");
}
//// Material //// Material