diff --git a/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java b/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java index f84676a35..daf79abda 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java +++ b/core/src/net/sf/openrocket/rocketcomponent/ParallelStage.java @@ -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() { diff --git a/core/src/net/sf/openrocket/rocketcomponent/PodSet.java b/core/src/net/sf/openrocket/rocketcomponent/PodSet.java index fed1cd7c3..8b9ca1829 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/PodSet.java +++ b/core/src/net/sf/openrocket/rocketcomponent/PodSet.java @@ -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() { diff --git a/core/src/net/sf/openrocket/rocketcomponent/position/AngleMethod.java b/core/src/net/sf/openrocket/rocketcomponent/position/AngleMethod.java index ace87b62d..bedaa6252 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/position/AngleMethod.java +++ b/core/src/net/sf/openrocket/rocketcomponent/position/AngleMethod.java @@ -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; diff --git a/core/src/net/sf/openrocket/rocketcomponent/position/RadiusMethod.java b/core/src/net/sf/openrocket/rocketcomponent/position/RadiusMethod.java index 0201fec67..0e79178bf 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/position/RadiusMethod.java +++ b/core/src/net/sf/openrocket/rocketcomponent/position/RadiusMethod.java @@ -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; diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ComponentAssemblyConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ComponentAssemblyConfig.java index e310cf2b7..eaea5a57f 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/ComponentAssemblyConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/ComponentAssemblyConfig.java @@ -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 angleMethodModel = new EnumModel( boosters, "AngleMethod", AngleMethod.choices() ); - final JComboBox angleMethodCombo = new JComboBox( 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 angleMethodModel = new EnumModel( boosters, "AngleMethod", AngleMethod.choices() ); +// final JComboBox angleMethodCombo = new JComboBox( angleMethodModel ); +// motherPanel.add( angleMethodCombo, "align left, wrap"); JLabel angleLabel = new JLabel(trans.get("StageConfig.parallel.angle")); motherPanel.add( angleLabel, "align left");