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

[Bugfix] Fixed UI issues related to 'Instanceable' implementation.

Browse Source 
- Added set/get InstanceCount methods to BoosterSet, PodSets.
- changed order of editing tabs for BoosterSets, PodSets.
- When editing MotorMounts, fixed an incorrect model reference.
This commit is contained in:
Daniel_M_Williams 2015-10-16 19:05:32 -04:00
parent a7b4386358
commit 80c4ef5254
5 changed files with 43 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
core/src/net/sf/openrocket/rocketcomponent/BoosterSet.java
View File

@ -102,6 +102,20 @@ public class BoosterSet extends AxialStage implements FlightConfigurableComponen
return this.count;
}
@Override
public void setInstanceCount( final int newCount ){
mutex.verify();
if ( newCount < 1) {
// there must be at least one instance....
return;
}
this.count = newCount;
this.angularSeparation = Math.PI * 2 / this.count;
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
}
@Override
public double getRadialOffset() {
return this.radialPosition_m;
@ -164,12 +178,14 @@ public class BoosterSet extends AxialStage implements FlightConfigurableComponen
@Override
public void setRadialOffset(final double radius) {
mutex.verify();
this.radialPosition_m = radius;
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
}
@Override
public void setAngularOffset(final double angle_rad) {
mutex.verify();
this.angularPosition_rad = angle_rad;
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
}

23
core/src/net/sf/openrocket/rocketcomponent/PodSet.java
View File

@ -164,12 +164,33 @@ public class PodSet extends ComponentAssembly implements RingInstanceable, Outsi
public String getPatternName(){
return (this.getInstanceCount() + "-ring");
}
@Override
public double getRadialOffset() {
return this.radialPosition_m;
}
@Override
public int getInstanceCount() {
return this.count;
}
@Override
public void setInstanceCount( final int newCount ){
mutex.verify();
if ( newCount < 1) {
// there must be at least one instance....
return;
}
this.count = newCount;
this.angularSeparation = Math.PI * 2 / this.count;
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
}
@Override
public Coordinate[] shiftCoordinates(Coordinate[] c) {
@ -212,12 +233,14 @@ public class PodSet extends ComponentAssembly implements RingInstanceable, Outsi
@Override
public void setAngularOffset(double angle_rad) {
mutex.verify();
this.angularPosition_rad = angle_rad;
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
}
@Override
public void setRadialOffset(double radius_m) {
mutex.verify();
this.radialPosition_m = radius_m;
fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE);
}

2
swing/src/net/sf/openrocket/gui/configdialog/AxialStageConfig.java
View File

@ -29,7 +29,7 @@ public class AxialStageConfig extends ComponentAssemblyConfig {
if (component.getStageNumber() > 0) {
JPanel tab = separationTab((AxialStage) component);
tabbedPane.insertTab(trans.get("StageConfig.tab.Separation"), null, tab,
trans.get("StageConfig.tab.Separation.ttip"), 1);
trans.get("StageConfig.tab.Separation.ttip"), 2);
}
}

3
swing/src/net/sf/openrocket/gui/configdialog/ComponentAssemblyConfig.java
View File

@ -5,6 +5,7 @@ import javax.swing.JComboBox;
import javax.swing.JLabel;
import javax.swing.JPanel;
import javax.swing.JSpinner;
import net.miginfocom.swing.MigLayout;
import net.sf.openrocket.document.OpenRocketDocument;
import net.sf.openrocket.gui.SpinnerEditor;
@ -27,7 +28,7 @@ public class ComponentAssemblyConfig extends RocketComponentConfig {
// only stages which are actually off-centerline will get the dialog here:
if(( component instanceof ComponentAssembly )&&( ! component.isCenterline() )){
tabbedPane.insertTab( trans.get("RocketCompCfg.tab.Parallel"), null, parallelTab( (ComponentAssembly) component ), trans.get("RocketCompCfg.tab.ParallelComment"), 2);
tabbedPane.insertTab( trans.get("RocketCompCfg.tab.Parallel"), null, parallelTab( (ComponentAssembly) component ), trans.get("RocketCompCfg.tab.ParallelComment"), 1);
}
}

2
swing/src/net/sf/openrocket/gui/configdialog/MotorConfig.java
View File

@ -71,7 +71,7 @@ public class MotorConfig extends JPanel {
MotorInstance motorInstance = mount.getDefaultMotorInstance();
final EnumModel<IgnitionEvent> igEvModel = new EnumModel<IgnitionEvent>(motorMount, "IgnitionEvent", IgnitionEvent.values());
final EnumModel<IgnitionEvent> igEvModel = new EnumModel<IgnitionEvent>(motorInstance, "IgnitionEvent", IgnitionEvent.values());
final JComboBox<IgnitionEvent> eventBox = new JComboBox<IgnitionEvent>( igEvModel);
panel.add(eventBox , "growx, wrap");