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

removed pod code. This will be re-implemented later if appropriate.

Browse Source
This commit is contained in:
Daniel_M_Williams 2015-06-13 20:55:37 -04:00
parent a3f3b3b3bb
commit 2cd5fe6306
2 changed files with 1 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

60
core/src/net/sf/openrocket/rocketcomponent/ExternalComponent.java
View File

@ -16,12 +16,7 @@ import net.sf.openrocket.unit.UnitGroup;
* @author Sampo Niskanen <sampo.niskanen@iki.fi> * @author Sampo Niskanen <sampo.niskanen@iki.fi>
*/ */
public abstract class ExternalComponent extends RocketComponent implements OutsideComponent { public abstract class ExternalComponent extends RocketComponent {
private boolean outside = false;
private double position_angular_rad = 0;
private double position_radial_m = 0;
private double rotation_rad = 0;
public enum Finish { public enum Finish {
//// Rough //// Rough
@ -131,59 +126,6 @@ public abstract class ExternalComponent extends RocketComponent implements Outsi
fireComponentChangeEvent(ComponentChangeEvent.AERODYNAMIC_CHANGE); fireComponentChangeEvent(ComponentChangeEvent.AERODYNAMIC_CHANGE);
} }
@Override
public boolean getOutside() {
return this.outside;
}
public boolean isInline() {
return !this.outside;
}
@Override
public void setOutside(final boolean _outside) {
this.outside = _outside;
}
@Override
public double getAngularPosition() {
if (this.isInline()) {
return 0.;
}
return this.position_angular_rad;
}
@Override
public void setAngularPosition(final double phi) {
this.position_angular_rad = phi;
}
@Override
public double getRadialPosition() {
if (this.isInline()) {
return 0.;
}
return this.position_radial_m;
}
@Override
public void setRadialPosition(final double radius) {
this.position_radial_m = radius;
}
@Override
public double getRotation() {
if (this.isInline()) {
return 0.;
}
return this.rotation_rad;
}
@Override
public void setRotation(final double rotation) {
this.rotation_rad = rotation;
}
@Override @Override
protected void loadFromPreset(ComponentPreset preset) { protected void loadFromPreset(ComponentPreset preset) {

66
swing/src/net/sf/openrocket/gui/configdialog/RocketComponentConfig.java
View File

@ -73,9 +73,6 @@ public class RocketComponentConfig extends JPanel {
protected JTextArea commentTextArea; protected JTextArea commentTextArea;
private final TextFieldListener textFieldListener; private final TextFieldListener textFieldListener;
private BooleanModel podsEnabledModel = null;
private JPanel podsEnabledPanel = null;
private JPanel buttonPanel; private JPanel buttonPanel;
private JLabel infoLabel; private JLabel infoLabel;
@ -126,11 +123,6 @@ public class RocketComponentConfig extends JPanel {
tabbedPane.addTab(trans.get("RocketCompCfg.tab.Comment"), null, commentTab(), tabbedPane.addTab(trans.get("RocketCompCfg.tab.Comment"), null, commentTab(),
trans.get("RocketCompCfg.tab.Specifyacomment")); trans.get("RocketCompCfg.tab.Specifyacomment"));
if( component instanceof ExternalComponent ){
tabbedPane.insertTab( trans.get("RocketCompCfg.tab.Pod"), null, podTab( (ExternalComponent) component ), trans.get("RocketCompCfg.tab.PodComment"), 2);
}
addButtons(); addButtons();
updateFields(); updateFields();
@ -284,64 +276,6 @@ public class RocketComponentConfig extends JPanel {
return subPanel; return subPanel;
} }
private JPanel podTab( final ExternalComponent pod ){
// enable parallel staging
JPanel motherPanel = new JPanel( new MigLayout("fill"));
podsEnabledModel = new BooleanModel( component, "Outside");
podsEnabledModel.setValue( pod.getOutside());
JCheckBox parallelEnabled = new JCheckBox( podsEnabledModel);
parallelEnabled.setText(trans.get("RocketCompCfg.outside.pod"));
motherPanel.add(parallelEnabled, "wrap");
JPanel enabledPanel = new JPanel( new MigLayout("fill"));
this.podsEnabledPanel = enabledPanel;
enabledPanel.add(new JSeparator(SwingConstants.HORIZONTAL), "growx,wrap");
// set radial distance
enabledPanel.add(new JLabel(trans.get("RocketCompCfg.outside.radius")), "align left");
DoubleModel radiusModel = new DoubleModel( pod, "RadialPosition", 0.);
radiusModel.setCurrentUnit( UnitGroup.UNITS_DISTANCE.getSIUnit() );
JSpinner radiusSpinner = new JSpinner( radiusModel.getSpinnerModel());
radiusSpinner.setEditor(new SpinnerEditor(radiusSpinner ));
enabledPanel.add(radiusSpinner , "growx, wrap, align right");
// set angle around the primary stage
enabledPanel.add(new JLabel(trans.get("RocketCompCfg.outside.angle")), "align left");
DoubleModel angleModel = new DoubleModel( pod, "AngularPosition", 0., Math.PI*2);
angleModel.setCurrentUnit( UnitGroup.UNITS_ANGLE.getUnit("rad") );
JSpinner angleSpinner = new JSpinner(angleModel.getSpinnerModel());
angleSpinner.setEditor(new SpinnerEditor(angleSpinner));
enabledPanel.add(angleSpinner, "growx, wrap");
enabledPanel.add(new JLabel(trans.get("RocketCompCfg.outside.rotation")), "align left");
DoubleModel rotationModel = new DoubleModel( pod, "Rotation", 0.0, Math.PI*2);
rotationModel.setCurrentUnit( UnitGroup.UNITS_ANGLE.getUnit("rad") );
JSpinner rotationSpinner = new JSpinner(rotationModel.getSpinnerModel());
rotationSpinner.setEditor(new SpinnerEditor(rotationSpinner));
enabledPanel.add(rotationSpinner, "growx, wrap");
// TODO: add multiplicity
// enabledPanel.add(new JLabel(trans.get("RocketCompCfg.parallel.rotation")), "align left");
// DoubleModel rotationModel = new DoubleModel( pod, "Rotation", 0.0, Math.PI*2);
// JSpinner rotationSpinner = new JSpinner(rotationModel.getSpinnerModel());
// rotationSpinner.setEditor(new SpinnerEditor(rotationSpinner));
// enabledPanel.add(rotationSpinner, "growx, wrap");
//
setDeepEnabled( enabledPanel, podsEnabledModel.getValue());
parallelEnabled.addChangeListener(new ChangeListener() {
@Override
public void stateChanged(ChangeEvent e) {
setDeepEnabled( podsEnabledPanel, podsEnabledModel.getValue());
}
});
motherPanel.add( enabledPanel , "growx, wrap");
return motherPanel;
}
private JPanel overrideTab() { private JPanel overrideTab() {
JPanel panel = new JPanel(new MigLayout("align 50% 20%, fillx, gap rel unrel", JPanel panel = new JPanel(new MigLayout("align 50% 20%, fillx, gap rel unrel",
"[][65lp::][30lp::][]", "")); "[][65lp::][30lp::][]", ""));