[fix][partial] Address Some issues of TrapezoidFinSetConfig: isssue #329
This commit is contained in:
Daniel_M_Williams
parent
20318fde5c
commit
f5d786fab6
@ -32,193 +32,182 @@ 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());
|
||||||
|
|
||||||
|
|
||||||
JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
|
JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
|
||||||
|
|
||||||
//// Number of fins:
|
//// Number of fins:
|
||||||
JLabel label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Nbroffins"));
|
JLabel label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Nbroffins"));
|
||||||
//// The number of fins in the fin set.
|
//// The number of fins in the fin set.
|
||||||
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);
|
|
||||||
|
|
||||||
spin = new JSpinner(im.getSpinnerModel());
|
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
|
||||||
//// The number of fins in the fin set.
|
|
||||||
spin.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Nbroffins"));
|
|
||||||
panel.add(spin, "growx, wrap");
|
|
||||||
|
|
||||||
|
|
||||||
//// Base rotation
|
|
||||||
//// Fin rotation:
|
|
||||||
label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Finrotation"));
|
|
||||||
//// The angle of the first fin in the fin set.
|
|
||||||
label.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Finrotation"));
|
|
||||||
panel.add(label);
|
|
||||||
|
|
||||||
m = new DoubleModel(component, "BaseRotation", UnitGroup.UNITS_ANGLE);
|
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
|
||||||
panel.add(spin, "growx");
|
|
||||||
|
|
||||||
panel.add(new UnitSelector(m), "growx");
|
|
||||||
panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
|
|
||||||
|
|
||||||
|
|
||||||
//// Fin cant:
|
|
||||||
label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Fincant"));
|
|
||||||
//// The angle that the fins are canted with respect to the rocket
|
|
||||||
label.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Fincant"));
|
|
||||||
panel.add(label);
|
|
||||||
|
|
||||||
m = new DoubleModel(component, "CantAngle", UnitGroup.UNITS_ANGLE,
|
|
||||||
-FinSet.MAX_CANT, FinSet.MAX_CANT);
|
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
|
||||||
panel.add(spin, "growx");
|
|
||||||
|
|
||||||
panel.add(new UnitSelector(m), "growx");
|
|
||||||
panel.add(new BasicSlider(m.getSliderModel(-FinSet.MAX_CANT, FinSet.MAX_CANT)),
|
|
||||||
"w 100lp, wrap");
|
|
||||||
|
|
||||||
|
|
||||||
//// Root chord:
|
|
||||||
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Rootchord")));
|
|
||||||
|
|
||||||
m = new DoubleModel(component, "RootChord", UnitGroup.UNITS_LENGTH, 0);
|
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
|
||||||
panel.add(spin, "growx");
|
|
||||||
|
|
||||||
panel.add(new UnitSelector(m), "growx");
|
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Tip chord:
|
|
||||||
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Tipchord")));
|
|
||||||
|
|
||||||
m = new DoubleModel(component, "TipChord", UnitGroup.UNITS_LENGTH, 0);
|
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
|
||||||
panel.add(spin, "growx");
|
|
||||||
|
|
||||||
panel.add(new UnitSelector(m), "growx");
|
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
|
||||||
|
|
||||||
|
|
||||||
//// Height:
|
|
||||||
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Height")));
|
|
||||||
|
|
||||||
m = new DoubleModel(component, "Height", UnitGroup.UNITS_LENGTH, 0);
|
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
|
||||||
panel.add(spin, "growx");
|
|
||||||
|
|
||||||
panel.add(new UnitSelector(m), "growx");
|
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Sweep length:
|
|
||||||
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Sweeplength")));
|
|
||||||
|
|
||||||
m = new DoubleModel(component, "Sweep", UnitGroup.UNITS_LENGTH);
|
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
|
||||||
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
|
|
||||||
DoubleModel tc = new DoubleModel(component, "TipChord", -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");
|
|
||||||
|
|
||||||
|
|
||||||
//// Sweep angle:
|
|
||||||
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Sweepangle")));
|
|
||||||
|
|
||||||
m = new DoubleModel(component, "SweepAngle", UnitGroup.UNITS_ANGLE,
|
|
||||||
-TrapezoidFinSet.MAX_SWEEP_ANGLE, TrapezoidFinSet.MAX_SWEEP_ANGLE);
|
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
|
||||||
panel.add(spin, "growx");
|
|
||||||
|
|
||||||
panel.add(new UnitSelector(m), "growx");
|
|
||||||
panel.add(new BasicSlider(m.getSliderModel(-Math.PI / 4, Math.PI / 4)),
|
|
||||||
"w 100lp, wrap paragraph");
|
|
||||||
|
|
||||||
|
|
||||||
//// Position
|
|
||||||
//// Position relative to:
|
|
||||||
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Posrelativeto")));
|
|
||||||
|
|
||||||
final EnumModel<AxialMethod> methodModel = new EnumModel<AxialMethod>(component, "AxialMethod", AxialMethod.axialOffsetMethods );
|
|
||||||
final JComboBox<AxialMethod> positionCombo = new JComboBox<AxialMethod>( methodModel );
|
|
||||||
|
|
||||||
panel.add(positionCombo, "spanx, growx, wrap");
|
|
||||||
//// plus
|
|
||||||
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.plus")), "right");
|
|
||||||
|
|
||||||
m = new DoubleModel(component, "AxialOffset", UnitGroup.UNITS_LENGTH);
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
|
||||||
panel.add(spin, "growx");
|
|
||||||
|
|
||||||
panel.add(new UnitSelector(m), "growx");
|
|
||||||
panel.add(new BasicSlider(m.getSliderModel(
|
|
||||||
new DoubleModel(component.getParent(), "Length", -1.0, UnitGroup.UNITS_NONE),
|
|
||||||
new DoubleModel(component.getParent(), "Length"))),
|
|
||||||
"w 100lp, wrap para");
|
|
||||||
|
|
||||||
|
|
||||||
|
final IntegerModel finCountModel = new IntegerModel(component, "FinCount", 1, 8);
|
||||||
|
|
||||||
|
final JSpinner finCountSpinner = new JSpinner(finCountModel.getSpinnerModel());
|
||||||
mainPanel.add(panel, "aligny 20%");
|
finCountSpinner.setEditor(new SpinnerEditor(finCountSpinner));
|
||||||
|
//// The number of fins in the fin set.
|
||||||
mainPanel.add(new JSeparator(SwingConstants.VERTICAL), "growy");
|
finCountSpinner.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Nbroffins"));
|
||||||
|
panel.add(finCountSpinner, "growx, wrap");
|
||||||
|
|
||||||
|
|
||||||
|
{ /// Base rotation
|
||||||
|
label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Finrotation"));
|
||||||
|
//// The angle of the first fin in the fin set.
|
||||||
|
label.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Finrotation"));
|
||||||
|
panel.add(label);
|
||||||
|
|
||||||
|
final DoubleModel baseRotationModel = new DoubleModel(component, "BaseRotation", UnitGroup.UNITS_ANGLE);
|
||||||
|
|
||||||
|
final JSpinner baseRotationSpinner = new JSpinner(baseRotationModel.getSpinnerModel());
|
||||||
|
baseRotationSpinner.setEditor(new SpinnerEditor(baseRotationSpinner));
|
||||||
|
panel.add(baseRotationSpinner, "growx");
|
||||||
|
|
||||||
|
panel.add(new UnitSelector(baseRotationModel), "growx");
|
||||||
|
panel.add(new BasicSlider(baseRotationModel.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
|
||||||
|
}
|
||||||
|
|
||||||
|
{//// Fin cant:
|
||||||
|
label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Fincant"));
|
||||||
|
//// The angle that the fins are canted with respect to the rocket
|
||||||
|
label.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Fincant"));
|
||||||
|
panel.add(label);
|
||||||
|
|
||||||
|
final DoubleModel cantModel = new DoubleModel(component, "CantAngle", UnitGroup.UNITS_ANGLE, -FinSet.MAX_CANT, FinSet.MAX_CANT);
|
||||||
|
|
||||||
|
final JSpinner cantSpinner = new JSpinner(cantModel.getSpinnerModel());
|
||||||
|
cantSpinner.setEditor(new SpinnerEditor(cantSpinner));
|
||||||
|
panel.add(cantSpinner, "growx");
|
||||||
|
|
||||||
|
panel.add(new UnitSelector(cantModel), "growx");
|
||||||
|
panel.add(new BasicSlider(cantModel.getSliderModel(-FinSet.MAX_CANT, FinSet.MAX_CANT)),
|
||||||
|
"w 100lp, wrap");
|
||||||
|
}
|
||||||
|
|
||||||
|
{//// Root chord:
|
||||||
|
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Rootchord")));
|
||||||
|
|
||||||
|
final DoubleModel rootChordModel = new DoubleModel(component, "RootChord", UnitGroup.UNITS_LENGTH, 0);
|
||||||
|
|
||||||
|
final JSpinner rootChordSpinner = new JSpinner(rootChordModel.getSpinnerModel());
|
||||||
|
rootChordSpinner.setEditor(new SpinnerEditor(rootChordSpinner));
|
||||||
|
panel.add(rootChordSpinner, "growx");
|
||||||
|
|
||||||
|
panel.add(new UnitSelector(rootChordModel), "growx");
|
||||||
|
panel.add(new BasicSlider(rootChordModel.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
||||||
|
}
|
||||||
|
|
||||||
|
{//// Tip chord:
|
||||||
|
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Tipchord")));
|
||||||
|
|
||||||
|
final DoubleModel tipChordModel = new DoubleModel(component, "TipChord", UnitGroup.UNITS_LENGTH, 0);
|
||||||
|
|
||||||
|
final JSpinner tipChordSpinner = new JSpinner(tipChordModel.getSpinnerModel());
|
||||||
|
tipChordSpinner.setEditor(new SpinnerEditor(tipChordSpinner));
|
||||||
|
panel.add(tipChordSpinner, "growx");
|
||||||
|
|
||||||
|
panel.add(new UnitSelector(tipChordModel), "growx");
|
||||||
|
panel.add(new BasicSlider(tipChordModel.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
||||||
|
}
|
||||||
|
|
||||||
|
{//// Height:
|
||||||
|
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Height")));
|
||||||
|
|
||||||
|
final DoubleModel heightModel = new DoubleModel(component, "Height", UnitGroup.UNITS_LENGTH, 0);
|
||||||
|
|
||||||
|
final JSpinner heightSpinner = new JSpinner(heightModel.getSpinnerModel());
|
||||||
|
heightSpinner.setEditor(new SpinnerEditor(heightSpinner));
|
||||||
|
panel.add(heightSpinner, "growx");
|
||||||
|
|
||||||
|
panel.add(new UnitSelector(heightModel), "growx");
|
||||||
|
panel.add(new BasicSlider(heightModel.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
||||||
|
}
|
||||||
|
|
||||||
|
{//// Sweep length:
|
||||||
|
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Sweeplength")));
|
||||||
|
|
||||||
|
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");
|
||||||
|
|
||||||
|
panel.add(new UnitSelector(sweepDistanceModel), "growx");
|
||||||
|
|
||||||
|
// sweep slider from -1.1*TipChord to 1.1*RootChord
|
||||||
|
DoubleModel tc = new DoubleModel(component, "TipChord", -1.1, UnitGroup.UNITS_LENGTH);
|
||||||
|
DoubleModel rc = new DoubleModel(component, "RootChord", 1.1, UnitGroup.UNITS_LENGTH);
|
||||||
|
panel.add(new BasicSlider(sweepDistanceModel.getSliderModel(tc, rc)), "w 100lp, wrap");
|
||||||
|
}
|
||||||
|
|
||||||
|
{//// Sweep angle:
|
||||||
|
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Sweepangle")));
|
||||||
|
|
||||||
|
final DoubleModel sweepAngleModel = new DoubleModel(component, "SweepAngle", UnitGroup.UNITS_ANGLE,
|
||||||
|
-TrapezoidFinSet.MAX_SWEEP_ANGLE, TrapezoidFinSet.MAX_SWEEP_ANGLE);
|
||||||
|
component.addChangeListener(sweepAngleModel);
|
||||||
|
|
||||||
|
final JSpinner sweepAngleSpinner = new JSpinner(sweepAngleModel.getSpinnerModel());
|
||||||
|
sweepAngleSpinner.setEditor(new SpinnerEditor(sweepAngleSpinner));
|
||||||
|
panel.add(sweepAngleSpinner, "growx");
|
||||||
|
|
||||||
|
panel.add(new UnitSelector(sweepAngleModel), "growx");
|
||||||
|
panel.add(new BasicSlider(sweepAngleModel.getSliderModel(-Math.PI / 4, Math.PI / 4)),
|
||||||
|
"w 100lp, wrap paragraph");
|
||||||
|
}
|
||||||
|
|
||||||
|
{//// Position relative to:
|
||||||
|
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Posrelativeto")));
|
||||||
|
|
||||||
|
final EnumModel<AxialMethod> methodModel = new EnumModel<AxialMethod>(component, "AxialMethod", AxialMethod.axialOffsetMethods);
|
||||||
|
final JComboBox<AxialMethod> positionCombo = new JComboBox<AxialMethod>(methodModel);
|
||||||
|
|
||||||
|
panel.add(positionCombo, "spanx, growx, wrap");
|
||||||
|
//// plus
|
||||||
|
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.plus")), "right");
|
||||||
|
|
||||||
|
final DoubleModel axialOffsetModel = new DoubleModel(component, "AxialOffset", UnitGroup.UNITS_LENGTH);
|
||||||
|
final JSpinner axialOffsetSpinner = new JSpinner(axialOffsetModel.getSpinnerModel());
|
||||||
|
axialOffsetSpinner.setEditor(new SpinnerEditor(axialOffsetSpinner));
|
||||||
|
panel.add(axialOffsetSpinner, "growx");
|
||||||
|
|
||||||
|
panel.add(new UnitSelector(axialOffsetModel), "growx");
|
||||||
|
panel.add(new BasicSlider(axialOffsetModel.getSliderModel(
|
||||||
|
new DoubleModel(component.getParent(), "Length", -1.0, UnitGroup.UNITS_NONE),
|
||||||
|
new DoubleModel(component.getParent(), "Length"))),
|
||||||
|
"w 100lp, wrap para");
|
||||||
|
|
||||||
|
|
||||||
|
mainPanel.add(panel, "aligny 20%");
|
||||||
|
|
||||||
|
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"));
|
panel.add(sectionCombo, "span, growx, wrap");
|
||||||
panel.add( sectionCombo, "span, growx, wrap");
|
|
||||||
|
|
||||||
|
//// Thickness:
|
||||||
//// Thickness:
|
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Thickness")));
|
||||||
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Thickness")));
|
|
||||||
|
final DoubleModel thicknessModel = new DoubleModel(component, "Thickness", UnitGroup.UNITS_LENGTH, 0);
|
||||||
m = new DoubleModel(component, "Thickness", UnitGroup.UNITS_LENGTH, 0);
|
|
||||||
|
final JSpinner thicknessSpinner = new JSpinner(thicknessModel.getSpinnerModel());
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
thicknessSpinner.setEditor(new SpinnerEditor(thicknessSpinner));
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
panel.add(thicknessSpinner, "growx");
|
||||||
panel.add(spin, "growx");
|
|
||||||
|
panel.add(new UnitSelector(thicknessModel), "growx");
|
||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new BasicSlider(thicknessModel.getSliderModel(0, 0.01)), "w 100lp, wrap para");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap para");
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Material
|
//// Material
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user