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

[fix] removed Angle.Fixed and Radius.Surface positioning methods

Browse Source
This commit is contained in:
Daniel_M_Williams 2018-01-31 21:09:33 -05:00
parent de7f7b308b
commit 7017b0b2f0
5 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java
View File

@ -22,7 +22,7 @@ public class ParallelStage extends AxialStage implements FlightConfigurableCompo
protected double angleSeparation = Math.PI;
protected double angleOffset_rad = 0;
protected RadiusMethod radiusMethod = RadiusMethod.SURFACE;
protected RadiusMethod radiusMethod = RadiusMethod.RELATIVE;
protected double radiusOffset_m = 0;
public ParallelStage() {

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

@ -25,7 +25,7 @@ public class PodSet extends ComponentAssembly implements RingInstanceable {
// angle to the first pod
protected double angleOffset_rad = 0;
protected RadiusMethod radiusMethod = RadiusMethod.SURFACE;
protected RadiusMethod radiusMethod = RadiusMethod.RELATIVE;
protected double radiusOffset_m = 0;
public PodSet() {

2
core/src/net/sf/openrocket/rocketcomponent/position/AngleMethod.java
View File

@ -46,7 +46,7 @@ public enum AngleMethod implements DistanceMethod {
};
public static final AngleMethod[] choices(){
return new AngleMethod[]{ AngleMethod.RELATIVE, AngleMethod.FIXED };
return new AngleMethod[]{ AngleMethod.RELATIVE };
}
public final String name;

2
core/src/net/sf/openrocket/rocketcomponent/position/RadiusMethod.java
View File

@ -55,7 +55,7 @@ public enum RadiusMethod implements DistanceMethod {
};
public static final RadiusMethod[] choices(){
return new RadiusMethod[]{ RadiusMethod.FREE, RadiusMethod.RELATIVE, RadiusMethod.SURFACE };
return new RadiusMethod[]{ RadiusMethod.FREE, RadiusMethod.RELATIVE };
}
public final String name;

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

@ -64,12 +64,12 @@ public class ComponentAssemblyConfig extends RocketComponentConfig {
motherPanel.add(radiusUnitSelector, "growx 1, wrap");
// autoRadOffsModel.addEnableComponent(radiusUnitSelector, false);
// set location angle around the primary stage
JLabel angleMethodLabel = new JLabel(trans.get("RocketComponent.Position.Method.Angle.Label"));
motherPanel.add( angleMethodLabel, "align left");
EnumModel<AngleMethod> angleMethodModel = new EnumModel<AngleMethod>( boosters, "AngleMethod", AngleMethod.choices() );
final JComboBox<AngleMethod> angleMethodCombo = new JComboBox<AngleMethod>( angleMethodModel );
motherPanel.add( angleMethodCombo, "align left, wrap");
// // set location angle around the primary stage
// JLabel angleMethodLabel = new JLabel(trans.get("RocketComponent.Position.Method.Angle.Label"));
// motherPanel.add( angleMethodLabel, "align left");
// EnumModel<AngleMethod> angleMethodModel = new EnumModel<AngleMethod>( boosters, "AngleMethod", AngleMethod.choices() );
// final JComboBox<AngleMethod> angleMethodCombo = new JComboBox<AngleMethod>( angleMethodModel );
// motherPanel.add( angleMethodCombo, "align left, wrap");
JLabel angleLabel = new JLabel(trans.get("StageConfig.parallel.angle"));
motherPanel.add( angleLabel, "align left");