Fix inputting negative rotation angle values of various components
This commit is contained in:
parent
9c6b275e84
commit
ddc8f2e57c
@ -1,3 +1,7 @@
|
|||||||
|
2012-03-27 Sampo Niskanen
|
||||||
|
|
||||||
|
* [BUG] Inputting negative rotation angle values of components
|
||||||
|
|
||||||
2012-03-25 Sampo Niskanen
|
2012-03-25 Sampo Niskanen
|
||||||
|
|
||||||
* [BUG] Removed locale-specific toLowerCase/toUpperCase
|
* [BUG] Removed locale-specific toLowerCase/toUpperCase
|
||||||
@ -10,7 +14,7 @@
|
|||||||
2012-03-18 Jason Blood
|
2012-03-18 Jason Blood
|
||||||
|
|
||||||
* Updated importing images to freeform fin sets to work with color images with improved description
|
* Updated importing images to freeform fin sets to work with color images with improved description
|
||||||
|
|
||||||
2012-03-17 Sampo Niskanen
|
2012-03-17 Sampo Niskanen
|
||||||
|
|
||||||
* Released version 12.03
|
* Released version 12.03
|
||||||
|
|||||||
@ -35,8 +35,8 @@ public class EllipticalFinSetConfig extends FinSetConfig {
|
|||||||
|
|
||||||
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
|
||||||
@ -48,11 +48,11 @@ public class EllipticalFinSetConfig extends FinSetConfig {
|
|||||||
spin.setEditor(new SpinnerEditor(spin));
|
spin.setEditor(new SpinnerEditor(spin));
|
||||||
panel.add(spin, "growx, wrap");
|
panel.add(spin, "growx, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Base rotation
|
//// Base rotation
|
||||||
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Rotation")));
|
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Rotation")));
|
||||||
|
|
||||||
m = new DoubleModel(component, "BaseRotation", UnitGroup.UNITS_ANGLE, -Math.PI, Math.PI);
|
m = new DoubleModel(component, "BaseRotation", UnitGroup.UNITS_ANGLE);
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
spin = new JSpinner(m.getSpinnerModel());
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
spin.setEditor(new SpinnerEditor(spin));
|
||||||
@ -61,7 +61,7 @@ public class EllipticalFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Fin cant
|
//// Fin cant
|
||||||
JLabel label = new JLabel(trans.get("EllipticalFinSetCfg.Fincant"));
|
JLabel label = new JLabel(trans.get("EllipticalFinSetCfg.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
|
||||||
@ -79,8 +79,8 @@ public class EllipticalFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new BasicSlider(m.getSliderModel(-FinSet.MAX_CANT, FinSet.MAX_CANT)),
|
panel.add(new BasicSlider(m.getSliderModel(-FinSet.MAX_CANT, FinSet.MAX_CANT)),
|
||||||
"w 100lp, wrap");
|
"w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Root chord
|
//// Root chord
|
||||||
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Rootchord")));
|
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Rootchord")));
|
||||||
|
|
||||||
@ -93,7 +93,7 @@ public class EllipticalFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Height
|
//// Height
|
||||||
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Height")));
|
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Height")));
|
||||||
|
|
||||||
@ -106,7 +106,7 @@ public class EllipticalFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Position
|
//// Position
|
||||||
//// Position relative to:
|
//// Position relative to:
|
||||||
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Positionrelativeto")));
|
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Positionrelativeto")));
|
||||||
@ -118,7 +118,7 @@ public class EllipticalFinSetConfig extends FinSetConfig {
|
|||||||
RocketComponent.Position.MIDDLE,
|
RocketComponent.Position.MIDDLE,
|
||||||
RocketComponent.Position.BOTTOM,
|
RocketComponent.Position.BOTTOM,
|
||||||
RocketComponent.Position.ABSOLUTE
|
RocketComponent.Position.ABSOLUTE
|
||||||
}));
|
}));
|
||||||
panel.add(combo, "spanx, growx, wrap");
|
panel.add(combo, "spanx, growx, wrap");
|
||||||
|
|
||||||
//// plus
|
//// plus
|
||||||
@ -135,18 +135,18 @@ public class EllipticalFinSetConfig extends FinSetConfig {
|
|||||||
new DoubleModel(component.getParent(), "Length"))),
|
new DoubleModel(component.getParent(), "Length"))),
|
||||||
"w 100lp, wrap");
|
"w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Right portion
|
//// Right portion
|
||||||
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::]", ""));
|
||||||
|
|
||||||
|
|
||||||
//// Cross section
|
//// Cross section
|
||||||
//// Fin cross section:
|
//// Fin cross section:
|
||||||
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.FincrossSection")), "span, split");
|
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.FincrossSection")), "span, split");
|
||||||
@ -154,7 +154,7 @@ public class EllipticalFinSetConfig extends FinSetConfig {
|
|||||||
new EnumModel<FinSet.CrossSection>(component, "CrossSection"));
|
new EnumModel<FinSet.CrossSection>(component, "CrossSection"));
|
||||||
panel.add(combo, "growx, wrap unrel");
|
panel.add(combo, "growx, wrap unrel");
|
||||||
|
|
||||||
|
|
||||||
//// Thickness:
|
//// Thickness:
|
||||||
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Thickness")));
|
panel.add(new JLabel(trans.get("EllipticalFinSetCfg.Thickness")));
|
||||||
|
|
||||||
@ -167,15 +167,15 @@ public class EllipticalFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap 30lp");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap 30lp");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Material
|
//// Material
|
||||||
materialPanel(panel, Material.Type.BULK);
|
materialPanel(panel, Material.Type.BULK);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
mainPanel.add(panel, "aligny 20%");
|
mainPanel.add(panel, "aligny 20%");
|
||||||
|
|
||||||
addFinSetButtons();
|
addFinSetButtons();
|
||||||
|
|||||||
@ -104,7 +104,7 @@ public class FreeformFinSetConfig extends FinSetConfig {
|
|||||||
//// Base rotation
|
//// Base rotation
|
||||||
panel.add(new JLabel(trans.get("FreeformFinSetCfg.lbl.Finrotation")));
|
panel.add(new JLabel(trans.get("FreeformFinSetCfg.lbl.Finrotation")));
|
||||||
|
|
||||||
m = new DoubleModel(component, "BaseRotation", UnitGroup.UNITS_ANGLE, -Math.PI, Math.PI);
|
m = new DoubleModel(component, "BaseRotation", UnitGroup.UNITS_ANGLE);
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
spin = new JSpinner(m.getSpinnerModel());
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
spin.setEditor(new SpinnerEditor(spin));
|
||||||
|
|||||||
@ -29,7 +29,7 @@ public class LaunchLugConfig extends RocketComponentConfig {
|
|||||||
|
|
||||||
JPanel primary = new JPanel(new MigLayout("fill"));
|
JPanel primary = new JPanel(new MigLayout("fill"));
|
||||||
|
|
||||||
|
|
||||||
JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", ""));
|
JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", ""));
|
||||||
|
|
||||||
//// Body tube length
|
//// Body tube length
|
||||||
@ -45,7 +45,7 @@ public class LaunchLugConfig extends RocketComponentConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.02, 0.1)), "w 100lp, wrap para");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.02, 0.1)), "w 100lp, wrap para");
|
||||||
|
|
||||||
|
|
||||||
//// Body tube diameter
|
//// Body tube diameter
|
||||||
//// Outer diameter:
|
//// Outer diameter:
|
||||||
panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Outerdiam")));
|
panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Outerdiam")));
|
||||||
@ -60,14 +60,14 @@ public class LaunchLugConfig 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 rel");
|
panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap rel");
|
||||||
|
|
||||||
|
|
||||||
//// Inner diameter:
|
//// Inner diameter:
|
||||||
panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Innerdiam")));
|
panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Innerdiam")));
|
||||||
|
|
||||||
// Diameter = 2*Radius
|
// Diameter = 2*Radius
|
||||||
m = new DoubleModel(component, "InnerRadius", 2, UnitGroup.UNITS_LENGTH, 0);
|
m = new DoubleModel(component, "InnerRadius", 2, UnitGroup.UNITS_LENGTH, 0);
|
||||||
|
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
spin = new JSpinner(m.getSpinnerModel());
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
spin.setEditor(new SpinnerEditor(spin));
|
||||||
panel.add(spin, "growx");
|
panel.add(spin, "growx");
|
||||||
@ -75,7 +75,7 @@ public class LaunchLugConfig extends RocketComponentConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(new DoubleModel(0), od)), "w 100lp, wrap rel");
|
panel.add(new BasicSlider(m.getSliderModel(new DoubleModel(0), od)), "w 100lp, wrap rel");
|
||||||
|
|
||||||
|
|
||||||
//// Wall thickness
|
//// Wall thickness
|
||||||
//// Thickness:
|
//// Thickness:
|
||||||
panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Thickness")));
|
panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Thickness")));
|
||||||
@ -89,12 +89,11 @@ public class LaunchLugConfig extends RocketComponentConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap 20lp");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap 20lp");
|
||||||
|
|
||||||
|
|
||||||
//// Radial position:
|
//// Radial position:
|
||||||
panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Radialpos")));
|
panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Radialpos")));
|
||||||
|
|
||||||
m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE,
|
m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE);
|
||||||
-Math.PI, Math.PI);
|
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
spin = new JSpinner(m.getSpinnerModel());
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
spin.setEditor(new SpinnerEditor(spin));
|
||||||
@ -103,14 +102,14 @@ public class LaunchLugConfig extends RocketComponentConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
primary.add(panel, "grow, gapright 20lp");
|
primary.add(panel, "grow, gapright 20lp");
|
||||||
panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", ""));
|
panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", ""));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Position relative to:
|
//// Position relative to:
|
||||||
panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Posrelativeto")));
|
panel.add(new JLabel(trans.get("LaunchLugCfg.lbl.Posrelativeto")));
|
||||||
|
|
||||||
@ -121,7 +120,7 @@ public class LaunchLugConfig extends RocketComponentConfig {
|
|||||||
RocketComponent.Position.MIDDLE,
|
RocketComponent.Position.MIDDLE,
|
||||||
RocketComponent.Position.BOTTOM,
|
RocketComponent.Position.BOTTOM,
|
||||||
RocketComponent.Position.ABSOLUTE
|
RocketComponent.Position.ABSOLUTE
|
||||||
}));
|
}));
|
||||||
panel.add(combo, "spanx, growx, wrap");
|
panel.add(combo, "spanx, growx, wrap");
|
||||||
|
|
||||||
//// plus
|
//// plus
|
||||||
@ -138,12 +137,12 @@ public class LaunchLugConfig extends RocketComponentConfig {
|
|||||||
new DoubleModel(component.getParent(), "Length"))),
|
new DoubleModel(component.getParent(), "Length"))),
|
||||||
"w 100lp, wrap para");
|
"w 100lp, wrap para");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Material
|
//// Material
|
||||||
materialPanel(panel, Material.Type.BULK);
|
materialPanel(panel, Material.Type.BULK);
|
||||||
|
|
||||||
|
|
||||||
primary.add(panel, "grow");
|
primary.add(panel, "grow");
|
||||||
|
|
||||||
//// General and General properties
|
//// General and General properties
|
||||||
|
|||||||
@ -29,11 +29,11 @@ public class MassComponentConfig extends RocketComponentConfig {
|
|||||||
public MassComponentConfig(OpenRocketDocument d, RocketComponent component) {
|
public MassComponentConfig(OpenRocketDocument d, RocketComponent component) {
|
||||||
super(d, component);
|
super(d, component);
|
||||||
|
|
||||||
|
|
||||||
JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
|
JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Mass
|
//// Mass
|
||||||
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Mass")));
|
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Mass")));
|
||||||
|
|
||||||
@ -46,8 +46,8 @@ public class MassComponentConfig extends RocketComponentConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.5)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.5)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Mass length
|
//// Mass length
|
||||||
//// Length
|
//// Length
|
||||||
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Length")));
|
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Length")));
|
||||||
@ -61,7 +61,7 @@ public class MassComponentConfig extends RocketComponentConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 0.5)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 0.5)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Tube diameter
|
//// Tube diameter
|
||||||
//// Diameter:
|
//// Diameter:
|
||||||
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Diameter")));
|
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Diameter")));
|
||||||
@ -76,7 +76,7 @@ public class MassComponentConfig 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");
|
panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Position
|
//// Position
|
||||||
//// Position relative to:
|
//// Position relative to:
|
||||||
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.PosRelativeto")));
|
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.PosRelativeto")));
|
||||||
@ -88,7 +88,7 @@ public class MassComponentConfig extends RocketComponentConfig {
|
|||||||
RocketComponent.Position.MIDDLE,
|
RocketComponent.Position.MIDDLE,
|
||||||
RocketComponent.Position.BOTTOM,
|
RocketComponent.Position.BOTTOM,
|
||||||
RocketComponent.Position.ABSOLUTE
|
RocketComponent.Position.ABSOLUTE
|
||||||
}));
|
}));
|
||||||
panel.add(combo, "spanx, growx, wrap");
|
panel.add(combo, "spanx, growx, wrap");
|
||||||
//// plus
|
//// plus
|
||||||
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.plus")), "right");
|
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.plus")), "right");
|
||||||
@ -130,11 +130,11 @@ public class MassComponentConfig extends RocketComponentConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Radial direction:
|
//// Radial direction:
|
||||||
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Radialdirection")));
|
panel.add(new JLabel(trans.get("MassComponentCfg.lbl.Radialdirection")));
|
||||||
|
|
||||||
m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE, 0);
|
m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE);
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
spin = new JSpinner(m.getSpinnerModel());
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
spin.setEditor(new SpinnerEditor(spin));
|
||||||
@ -143,7 +143,7 @@ public class MassComponentConfig extends RocketComponentConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Reset button
|
//// Reset button
|
||||||
JButton button = new JButton(trans.get("MassComponentCfg.but.Reset"));
|
JButton button = new JButton(trans.get("MassComponentCfg.but.Reset"));
|
||||||
button.addActionListener(new ActionListener() {
|
button.addActionListener(new ActionListener() {
|
||||||
|
|||||||
@ -262,7 +262,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig {
|
|||||||
//// Radial direction:
|
//// Radial direction:
|
||||||
panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Radialdirection")));
|
panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Radialdirection")));
|
||||||
|
|
||||||
m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE, 0);
|
m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE);
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
spin = new JSpinner(m.getSpinnerModel());
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
spin.setEditor(new SpinnerEditor(spin));
|
||||||
|
|||||||
@ -41,7 +41,7 @@ public class RingComponentConfig extends RocketComponentConfig {
|
|||||||
JSpinner spin;
|
JSpinner spin;
|
||||||
DoubleModel od = null;
|
DoubleModel od = null;
|
||||||
|
|
||||||
|
|
||||||
//// Outer diameter
|
//// Outer diameter
|
||||||
if (outer != null) {
|
if (outer != null) {
|
||||||
panel.add(new JLabel(outer));
|
panel.add(new JLabel(outer));
|
||||||
@ -65,7 +65,7 @@ public class RingComponentConfig extends RocketComponentConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//// Inner diameter
|
//// Inner diameter
|
||||||
if (inner != null) {
|
if (inner != null) {
|
||||||
panel.add(new JLabel(inner));
|
panel.add(new JLabel(inner));
|
||||||
@ -92,7 +92,7 @@ public class RingComponentConfig extends RocketComponentConfig {
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//// Wall thickness
|
//// Wall thickness
|
||||||
if (thickness != null) {
|
if (thickness != null) {
|
||||||
panel.add(new JLabel(thickness));
|
panel.add(new JLabel(thickness));
|
||||||
@ -108,7 +108,7 @@ public class RingComponentConfig extends RocketComponentConfig {
|
|||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//// Inner tube length
|
//// Inner tube length
|
||||||
if (length != null) {
|
if (length != null) {
|
||||||
panel.add(new JLabel(length));
|
panel.add(new JLabel(length));
|
||||||
@ -124,7 +124,7 @@ public class RingComponentConfig extends RocketComponentConfig {
|
|||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
//// Position
|
//// Position
|
||||||
|
|
||||||
//// Position relative to:
|
//// Position relative to:
|
||||||
@ -137,7 +137,7 @@ public class RingComponentConfig extends RocketComponentConfig {
|
|||||||
RocketComponent.Position.MIDDLE,
|
RocketComponent.Position.MIDDLE,
|
||||||
RocketComponent.Position.BOTTOM,
|
RocketComponent.Position.BOTTOM,
|
||||||
RocketComponent.Position.ABSOLUTE
|
RocketComponent.Position.ABSOLUTE
|
||||||
}));
|
}));
|
||||||
panel.add(combo, "spanx 3, growx, wrap");
|
panel.add(combo, "spanx 3, growx, wrap");
|
||||||
|
|
||||||
//// plus
|
//// plus
|
||||||
@ -155,7 +155,7 @@ public class RingComponentConfig extends RocketComponentConfig {
|
|||||||
new DoubleModel(component.getParent(), "Length"))),
|
new DoubleModel(component.getParent(), "Length"))),
|
||||||
"w 100lp, wrap");
|
"w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Material
|
//// Material
|
||||||
JPanel sub = materialPanel(new JPanel(new MigLayout()), Material.Type.BULK);
|
JPanel sub = materialPanel(new JPanel(new MigLayout()), Material.Type.BULK);
|
||||||
|
|
||||||
@ -195,14 +195,14 @@ public class RingComponentConfig extends RocketComponentConfig {
|
|||||||
bs.setToolTipText(trans.get("ringcompcfg.Distancefrom"));
|
bs.setToolTipText(trans.get("ringcompcfg.Distancefrom"));
|
||||||
panel.add(bs, "w 100lp, wrap");
|
panel.add(bs, "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Radial direction
|
//// Radial direction
|
||||||
l = new JLabel(trans.get("ringcompcfg.Radialdirection"));
|
l = new JLabel(trans.get("ringcompcfg.Radialdirection"));
|
||||||
//// The radial direction from the rocket centerline
|
//// The radial direction from the rocket centerline
|
||||||
l.setToolTipText(trans.get("ringcompcfg.radialdirectionfrom"));
|
l.setToolTipText(trans.get("ringcompcfg.radialdirectionfrom"));
|
||||||
panel.add(l);
|
panel.add(l);
|
||||||
|
|
||||||
m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE, 0);
|
m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE);
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
spin = new JSpinner(m.getSpinnerModel());
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
spin.setEditor(new SpinnerEditor(spin));
|
||||||
@ -216,7 +216,7 @@ public class RingComponentConfig extends RocketComponentConfig {
|
|||||||
bs.setToolTipText(trans.get("ringcompcfg.radialdirectionfrom"));
|
bs.setToolTipText(trans.get("ringcompcfg.radialdirectionfrom"));
|
||||||
panel.add(bs, "w 100lp, wrap");
|
panel.add(bs, "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Reset button
|
//// Reset button
|
||||||
JButton button = new JButton(trans.get("ringcompcfg.but.Reset"));
|
JButton button = new JButton(trans.get("ringcompcfg.but.Reset"));
|
||||||
//// Reset the component to the rocket centerline
|
//// Reset the component to the rocket centerline
|
||||||
@ -230,13 +230,13 @@ public class RingComponentConfig extends RocketComponentConfig {
|
|||||||
});
|
});
|
||||||
panel.add(button, "spanx, right, wrap para");
|
panel.add(button, "spanx, right, wrap para");
|
||||||
|
|
||||||
|
|
||||||
DescriptionArea note = new DescriptionArea(3);
|
DescriptionArea note = new DescriptionArea(3);
|
||||||
//// Note: An inner tube will not affect the aerodynamics of the rocket even if it is located outside of the body tube.
|
//// Note: An inner tube will not affect the aerodynamics of the rocket even if it is located outside of the body tube.
|
||||||
note.setText(trans.get("ringcompcfg.note.desc"));
|
note.setText(trans.get("ringcompcfg.note.desc"));
|
||||||
panel.add(note, "spanx, growx");
|
panel.add(note, "spanx, growx");
|
||||||
|
|
||||||
|
|
||||||
return panel;
|
return panel;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@ -39,7 +39,7 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
|
|
||||||
JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", ""));
|
JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", ""));
|
||||||
|
|
||||||
|
|
||||||
//// Strip length:
|
//// Strip length:
|
||||||
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Striplength")));
|
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Striplength")));
|
||||||
|
|
||||||
@ -62,8 +62,8 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.2)), "w 100lp, wrap 20lp");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.2)), "w 100lp, wrap 20lp");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Strip area:
|
//// Strip area:
|
||||||
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Striparea")));
|
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Striparea")));
|
||||||
|
|
||||||
@ -86,7 +86,7 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
// panel.add(new UnitSelector(m),"growx");
|
// panel.add(new UnitSelector(m),"growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(2, 15)), "skip, w 100lp, wrap 20lp");
|
panel.add(new BasicSlider(m.getSliderModel(2, 15)), "skip, w 100lp, wrap 20lp");
|
||||||
|
|
||||||
|
|
||||||
//// Material:
|
//// Material:
|
||||||
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Material")));
|
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Material")));
|
||||||
|
|
||||||
@ -96,8 +96,8 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
combo.setToolTipText(trans.get("StreamerCfg.combo.ttip.MaterialModel"));
|
combo.setToolTipText(trans.get("StreamerCfg.combo.ttip.MaterialModel"));
|
||||||
panel.add(combo, "spanx 3, growx, wrap 20lp");
|
panel.add(combo, "spanx 3, growx, wrap 20lp");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
// CD
|
// CD
|
||||||
//// <html>Drag coefficient C<sub>D</sub>:
|
//// <html>Drag coefficient C<sub>D</sub>:
|
||||||
JLabel label = new HtmlLabel(trans.get("StreamerCfg.lbl.longA1"));
|
JLabel label = new HtmlLabel(trans.get("StreamerCfg.lbl.longA1"));
|
||||||
@ -124,14 +124,14 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
panel.add(new StyledLabel(trans.get("StreamerCfg.lbl.longC1"),
|
panel.add(new StyledLabel(trans.get("StreamerCfg.lbl.longC1"),
|
||||||
-2), "span, wrap");
|
-2), "span, wrap");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
primary.add(panel, "grow, gapright 20lp");
|
primary.add(panel, "grow, gapright 20lp");
|
||||||
panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", ""));
|
panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::][]", ""));
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Position
|
//// Position
|
||||||
//// Position relative to:
|
//// Position relative to:
|
||||||
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Posrelativeto")));
|
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Posrelativeto")));
|
||||||
@ -143,7 +143,7 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
RocketComponent.Position.MIDDLE,
|
RocketComponent.Position.MIDDLE,
|
||||||
RocketComponent.Position.BOTTOM,
|
RocketComponent.Position.BOTTOM,
|
||||||
RocketComponent.Position.ABSOLUTE
|
RocketComponent.Position.ABSOLUTE
|
||||||
}));
|
}));
|
||||||
panel.add(combo, "spanx, growx, wrap");
|
panel.add(combo, "spanx, growx, wrap");
|
||||||
|
|
||||||
//// plus
|
//// plus
|
||||||
@ -160,7 +160,7 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
new DoubleModel(component.getParent(), "Length"))),
|
new DoubleModel(component.getParent(), "Length"))),
|
||||||
"w 100lp, wrap");
|
"w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Spatial length:
|
//// Spatial length:
|
||||||
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Packedlength")));
|
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Packedlength")));
|
||||||
|
|
||||||
@ -173,7 +173,7 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 0.5)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 0.5)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Tube diameter
|
//// Tube diameter
|
||||||
//// Packed diameter:
|
//// Packed diameter:
|
||||||
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Packeddiam")));
|
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Packeddiam")));
|
||||||
@ -188,7 +188,7 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
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 30lp");
|
panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap 30lp");
|
||||||
|
|
||||||
|
|
||||||
//// Deployment
|
//// Deployment
|
||||||
//// Deploys at:
|
//// Deploys at:
|
||||||
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Deploysat")), "");
|
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Deploysat")), "");
|
||||||
@ -226,7 +226,7 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
altitudeComponents.add(slider);
|
altitudeComponents.add(slider);
|
||||||
panel.add(slider, "w 100lp, wrap");
|
panel.add(slider, "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
primary.add(panel, "grow");
|
primary.add(panel, "grow");
|
||||||
|
|
||||||
updateFields();
|
updateFields();
|
||||||
@ -241,9 +241,9 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
protected JPanel positionTab() {
|
protected JPanel positionTab() {
|
||||||
JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
|
JPanel panel = new JPanel(new MigLayout("gap rel unrel", "[][65lp::][30lp::]", ""));
|
||||||
|
|
||||||
@ -260,12 +260,12 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.1, 1.0)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Radial direction
|
//// Radial direction
|
||||||
//// Radial direction:
|
//// Radial direction:
|
||||||
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Radialdirection")));
|
panel.add(new JLabel(trans.get("StreamerCfg.lbl.Radialdirection")));
|
||||||
|
|
||||||
m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE, 0);
|
m = new DoubleModel(component, "RadialDirection", UnitGroup.UNITS_ANGLE);
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
spin = new JSpinner(m.getSpinnerModel());
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
spin.setEditor(new SpinnerEditor(spin));
|
||||||
@ -274,7 +274,7 @@ public class StreamerConfig extends RecoveryDeviceConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Reset button
|
//// Reset button
|
||||||
JButton button = new JButton(trans.get("StreamerCfg.but.Reset"));
|
JButton button = new JButton(trans.get("StreamerCfg.but.Reset"));
|
||||||
button.addActionListener(new ActionListener() {
|
button.addActionListener(new ActionListener() {
|
||||||
|
|||||||
@ -37,7 +37,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
|
|
||||||
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:
|
||||||
@ -54,7 +54,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
spin.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Nbroffins"));
|
spin.setToolTipText(trans.get("TrapezoidFinSetCfg.lbl.ttip.Nbroffins"));
|
||||||
panel.add(spin, "growx, wrap");
|
panel.add(spin, "growx, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Base rotation
|
//// Base rotation
|
||||||
//// Fin rotation:
|
//// Fin rotation:
|
||||||
label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Finrotation"));
|
label = new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Finrotation"));
|
||||||
@ -62,7 +62,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
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, -Math.PI, Math.PI);
|
m = new DoubleModel(component, "BaseRotation", UnitGroup.UNITS_ANGLE);
|
||||||
|
|
||||||
spin = new JSpinner(m.getSpinnerModel());
|
spin = new JSpinner(m.getSpinnerModel());
|
||||||
spin.setEditor(new SpinnerEditor(spin));
|
spin.setEditor(new SpinnerEditor(spin));
|
||||||
@ -71,7 +71,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(-Math.PI, Math.PI)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.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
|
||||||
@ -89,7 +89,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new BasicSlider(m.getSliderModel(-FinSet.MAX_CANT, FinSet.MAX_CANT)),
|
panel.add(new BasicSlider(m.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")));
|
||||||
|
|
||||||
@ -102,8 +102,8 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.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")));
|
||||||
|
|
||||||
@ -116,7 +116,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.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")));
|
||||||
|
|
||||||
@ -129,8 +129,8 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.05, 0.2)), "w 100lp, wrap");
|
panel.add(new BasicSlider(m.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")));
|
||||||
|
|
||||||
@ -147,7 +147,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
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(m.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")));
|
||||||
|
|
||||||
@ -162,27 +162,27 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new BasicSlider(m.getSliderModel(-Math.PI / 4, Math.PI / 4)),
|
panel.add(new BasicSlider(m.getSliderModel(-Math.PI / 4, Math.PI / 4)),
|
||||||
"w 100lp, wrap paragraph");
|
"w 100lp, wrap paragraph");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
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")));
|
||||||
combo = new JComboBox(
|
combo = new JComboBox(
|
||||||
new EnumModel<FinSet.CrossSection>(component, "CrossSection"));
|
new EnumModel<FinSet.CrossSection>(component, "CrossSection"));
|
||||||
panel.add(combo, "span, growx, wrap");
|
panel.add(combo, "span, growx, wrap");
|
||||||
|
|
||||||
|
|
||||||
//// Thickness:
|
//// Thickness:
|
||||||
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Thickness")));
|
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Thickness")));
|
||||||
|
|
||||||
@ -195,7 +195,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
panel.add(new UnitSelector(m), "growx");
|
panel.add(new UnitSelector(m), "growx");
|
||||||
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap para");
|
panel.add(new BasicSlider(m.getSliderModel(0, 0.01)), "w 100lp, wrap para");
|
||||||
|
|
||||||
|
|
||||||
//// Position
|
//// Position
|
||||||
//// Position relative to:
|
//// Position relative to:
|
||||||
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Posrelativeto")));
|
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.Posrelativeto")));
|
||||||
@ -207,7 +207,7 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
RocketComponent.Position.MIDDLE,
|
RocketComponent.Position.MIDDLE,
|
||||||
RocketComponent.Position.BOTTOM,
|
RocketComponent.Position.BOTTOM,
|
||||||
RocketComponent.Position.ABSOLUTE
|
RocketComponent.Position.ABSOLUTE
|
||||||
}));
|
}));
|
||||||
panel.add(combo, "spanx, growx, wrap");
|
panel.add(combo, "spanx, growx, wrap");
|
||||||
//// plus
|
//// plus
|
||||||
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.plus")), "right");
|
panel.add(new JLabel(trans.get("TrapezoidFinSetCfg.lbl.plus")), "right");
|
||||||
@ -223,14 +223,14 @@ public class TrapezoidFinSetConfig extends FinSetConfig {
|
|||||||
new DoubleModel(component.getParent(), "Length"))),
|
new DoubleModel(component.getParent(), "Length"))),
|
||||||
"w 100lp, wrap para");
|
"w 100lp, wrap para");
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
//// Material
|
//// Material
|
||||||
materialPanel(panel, Material.Type.BULK);
|
materialPanel(panel, Material.Type.BULK);
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
mainPanel.add(panel, "aligny 20%");
|
mainPanel.add(panel, "aligny 20%");
|
||||||
|
|
||||||
//// General and General properties
|
//// General and General properties
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user