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

parallel stage config: bugfixes and text correction. RelativeTo option still NYI

Browse Source
This commit is contained in:
Daniel_M_Williams 2015-06-25 17:34:25 -04:00
parent 0945961fc4
commit ee21c7ea0c
1 changed files with 19 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

35
swing/src/net/sf/openrocket/gui/configdialog/StageConfig.java
View File

@ -2,8 +2,10 @@ package net.sf.openrocket.gui.configdialog;
import java.awt.Component; import java.awt.Component;
import java.awt.Container; import java.awt.Container;
import java.util.List;
import javax.swing.ComboBoxModel; import javax.swing.ComboBoxModel;
import javax.swing.DefaultComboBoxModel;
import javax.swing.JCheckBox; import javax.swing.JCheckBox;
import javax.swing.JComboBox; import javax.swing.JComboBox;
import javax.swing.JLabel; import javax.swing.JLabel;
@ -121,7 +123,7 @@ public class StageConfig extends RocketComponentConfig {
// setPositions relative to parent component // setPositions relative to parent component
JLabel positionLabel = new JLabel(trans.get("LaunchLugCfg.lbl.Posrelativeto")); JLabel positionLabel = new JLabel(trans.get("LaunchLugCfg.lbl.Posrelativeto"));
motherPanel.add( positionLabel); motherPanel.add( positionLabel);
parallelEnabledModel.addEnableComponent( positionLabel); parallelEnabledModel.addEnableComponent( positionLabel, true);
// EnumModel(ChangeSource source, String valueName, Enum<T>[] values) { // EnumModel(ChangeSource source, String valueName, Enum<T>[] values) {
ComboBoxModel<RocketComponent.Position> posRelModel = new EnumModel<RocketComponent.Position>(component, "RelativePosition", ComboBoxModel<RocketComponent.Position> posRelModel = new EnumModel<RocketComponent.Position>(component, "RelativePosition",
@ -131,34 +133,35 @@ public class StageConfig extends RocketComponentConfig {
RocketComponent.Position.BOTTOM, RocketComponent.Position.BOTTOM,
RocketComponent.Position.ABSOLUTE RocketComponent.Position.ABSOLUTE
}); });
JComboBox<?> combo = new JComboBox<RocketComponent.Position>( posRelModel ); JComboBox<?> positionMethodCombo = new JComboBox<RocketComponent.Position>( posRelModel );
motherPanel.add(combo, "spanx 2, growx, wrap"); motherPanel.add(positionMethodCombo, "spanx 2, growx, wrap");
parallelEnabledModel.addEnableComponent( positionLabel); parallelEnabledModel.addEnableComponent( positionMethodCombo, true);
// setPositions relative to parent component // setPositions relative to parent component
JLabel parentLabel = new JLabel(trans.get("RocketCompCfg.outside.componentname")); JLabel relativeStageLabel = new JLabel(trans.get("RocketCompCfg.outside.componentname"));
motherPanel.add( parentLabel); motherPanel.add( relativeStageLabel);
parallelEnabledModel.addEnableComponent( parentLabel); parallelEnabledModel.addEnableComponent( relativeStageLabel, true);
// may need to implement a new ComponentComboModel or something
// setPositions relative to parent component List<RocketComponent> stageList = stage.getParent().getChildren();
// ComboBoxModel<?> componentModel = new Enj RocketComponent[] forCombo = new RocketComponent[stageList.size()];
// JComboBox<?> relToCombo = new JComboBox<?>( componentModel ); forCombo = stageList.toArray(forCombo);
JLabel relToCombo = new JLabel( stage.getParent().getName() ); DefaultComboBoxModel<RocketComponent> relativeStageComboModel = new DefaultComboBoxModel<RocketComponent>( forCombo );
ComboBoxModel<RocketComponent> relativeStageCombo = relativeStageComboModel;
JComboBox<?> relToCombo = new JComboBox<RocketComponent>( relativeStageCombo );
motherPanel.add( relToCombo , "growx, wrap"); motherPanel.add( relToCombo , "growx, wrap");
parallelEnabledModel.addEnableComponent( relToCombo ); parallelEnabledModel.addEnableComponent( relToCombo, true );
// plus // plus
JLabel positionPlusLabel = new JLabel(trans.get("LaunchLugCfg.lbl.plus")); JLabel positionPlusLabel = new JLabel(trans.get("LaunchLugCfg.lbl.plus"));
motherPanel.add( positionPlusLabel ); motherPanel.add( positionPlusLabel );
parallelEnabledModel.addEnableComponent( positionPlusLabel ); parallelEnabledModel.addEnableComponent( positionPlusLabel, true );
DoubleModel axialPositionModel = new DoubleModel(component, "AxialPosition", UnitGroup.UNITS_LENGTH); DoubleModel axialPositionModel = new DoubleModel(component, "AxialPosition", UnitGroup.UNITS_LENGTH);
JSpinner axPosSpin= new JSpinner( axialPositionModel.getSpinnerModel()); JSpinner axPosSpin= new JSpinner( axialPositionModel.getSpinnerModel());
axPosSpin.setEditor(new SpinnerEditor(axPosSpin)); axPosSpin.setEditor(new SpinnerEditor(axPosSpin));
motherPanel.add(axPosSpin, "growx"); motherPanel.add(axPosSpin, "growx");
parallelEnabledModel.addEnableComponent( positionPlusLabel ); parallelEnabledModel.addEnableComponent( axPosSpin, true );
return motherPanel; return motherPanel;
} }