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

[fixes #976] Updated display order v1.0

Browse Source
This commit is contained in:
Sibo Van Gool 2021-07-10 19:49:42 +02:00
parent c21127f4e3
commit 6d7e25b0a8
13 changed files with 30 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -46,7 +46,7 @@ public class BodyTube extends SymmetricComponent implements BoxBounded, MotorMou
this.length = Math.max(length, 0); this.length = Math.max(length, 0);
motors = new MotorConfigurationSet(this); motors = new MotorConfigurationSet(this);
super.displayOrder_side = 0; // Order for displaying the component in the 2D side view super.displayOrder_side = 0; // Order for displaying the component in the 2D side view
super.displayOrder_back = 0; // Order for displaying the component in the 2D back view super.displayOrder_back = 1; // Order for displaying the component in the 2D back view
} }
public BodyTube(double length, double radius, boolean filled) { public BodyTube(double length, double radius, boolean filled) {

4
core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java
View File

@ -13,8 +13,8 @@ public class Bulkhead extends RadiusRingComponent {
public Bulkhead() { public Bulkhead() {
setOuterRadiusAutomatic(true); setOuterRadiusAutomatic(true);
setLength(0.002); setLength(0.002);
super.displayOrder_side = 10; // Order for displaying the component in the 2D side view super.displayOrder_side = 8; // Order for displaying the component in the 2D side view
super.displayOrder_back = 10; // Order for displaying the component in the 2D back view super.displayOrder_back = 13; // Order for displaying the component in the 2D back view
} }
@Override @Override

4
core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java
View File

@ -13,8 +13,8 @@ public class CenteringRing extends RadiusRingComponent {
setOuterRadiusAutomatic(true); setOuterRadiusAutomatic(true);
setInnerRadiusAutomatic(true); setInnerRadiusAutomatic(true);
setLength(0.002); setLength(0.002);
super.displayOrder_side = 9; // Order for displaying the component in the 2D side view super.displayOrder_side = 7; // Order for displaying the component in the 2D side view
super.displayOrder_back = 9; // Order for displaying the component in the 2D back view super.displayOrder_back = 14; // Order for displaying the component in the 2D back view
} }
private static final Translator trans = Application.getTranslator(); private static final Translator trans = Application.getTranslator();

4
core/src/net/sf/openrocket/rocketcomponent/EngineBlock.java
View File

@ -16,8 +16,8 @@ public class EngineBlock extends ThicknessRingComponent implements AxialPosition
setOuterRadiusAutomatic(true); setOuterRadiusAutomatic(true);
setThickness(0.005); setThickness(0.005);
setLength(0.005); setLength(0.005);
super.displayOrder_side = 11; // Order for displaying the component in the 2D side view super.displayOrder_side = 9; // Order for displaying the component in the 2D side view
super.displayOrder_back = 11; // Order for displaying the component in the 2D back view super.displayOrder_back = 15; // Order for displaying the component in the 2D back view
} }
@Override @Override

4
core/src/net/sf/openrocket/rocketcomponent/InnerTube.java
View File

@ -49,8 +49,8 @@ public class InnerTube extends ThicknessRingComponent implements AxialPositionab
motors = new MotorConfigurationSet(this); motors = new MotorConfigurationSet(this);
super.displayOrder_side = 7; // Order for displaying the component in the 2D side view super.displayOrder_side = 5; // Order for displaying the component in the 2D side view
super.displayOrder_back = 7; // Order for displaying the component in the 2D back view super.displayOrder_back = 12; // Order for displaying the component in the 2D back view
} }

4
core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java
View File

@ -37,8 +37,8 @@ public class LaunchLug extends ExternalComponent implements AnglePositionable, B
radius = 0.01 / 2; radius = 0.01 / 2;
thickness = 0.001; thickness = 0.001;
length = 0.03; length = 0.03;
super.displayOrder_side = 6; // Order for displaying the component in the 2D side view super.displayOrder_side = 15; // Order for displaying the component in the 2D side view
super.displayOrder_back = 6; // Order for displaying the component in the 2D back view super.displayOrder_back = 10; // Order for displaying the component in the 2D back view
} }

8
core/src/net/sf/openrocket/rocketcomponent/MassComponent.java
View File

@ -41,15 +41,15 @@ public class MassComponent extends MassObject {
public MassComponent() { public MassComponent() {
super(); super();
super.displayOrder_side = 14; // Order for displaying the component in the 2D side view super.displayOrder_side = 13; // Order for displaying the component in the 2D side view
super.displayOrder_back = 14; // Order for displaying the component in the 2D back view super.displayOrder_back = 8; // Order for displaying the component in the 2D back view
} }
public MassComponent(double length, double radius, double mass) { public MassComponent(double length, double radius, double mass) {
super(length, radius); super(length, radius);
this.mass = mass; this.mass = mass;
super.displayOrder_side = 14; // Order for displaying the component in the 2D side view super.displayOrder_side = 13; // Order for displaying the component in the 2D side view
super.displayOrder_back = 14; // Order for displaying the component in the 2D back view super.displayOrder_back = 8; // Order for displaying the component in the 2D back view
} }

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

@ -44,7 +44,7 @@ public class NoseCone extends Transition implements InsideColorComponent {
super.setAftRadius(radius); super.setAftRadius(radius);
super.displayOrder_side = 1; // Order for displaying the component in the 2D side view super.displayOrder_side = 1; // Order for displaying the component in the 2D side view
super.displayOrder_back = 1; // Order for displaying the component in the 2D back view super.displayOrder_back = 0; // Order for displaying the component in the 2D back view
} }

4
core/src/net/sf/openrocket/rocketcomponent/Parachute.java
View File

@ -23,8 +23,8 @@ public class Parachute extends RecoveryDevice {
this.diameter = 0.3; this.diameter = 0.3;
this.lineMaterial = Application.getPreferences().getDefaultComponentMaterial(Parachute.class, Material.Type.LINE); this.lineMaterial = Application.getPreferences().getDefaultComponentMaterial(Parachute.class, Material.Type.LINE);
this.lineLength = 0.3; this.lineLength = 0.3;
super.displayOrder_side = 12; // Order for displaying the component in the 2D side view super.displayOrder_side = 11; // Order for displaying the component in the 2D side view
super.displayOrder_back = 12; // Order for displaying the component in the 2D back view super.displayOrder_back = 7; // Order for displaying the component in the 2D back view
} }

12
core/src/net/sf/openrocket/rocketcomponent/RailButton.java
View File

@ -69,16 +69,16 @@ public class RailButton extends ExternalComponent implements AnglePositionable,
this.setStandoff( 0.002); this.setStandoff( 0.002);
this.setInstanceSeparation( this.outerDiameter_m * 6); this.setInstanceSeparation( this.outerDiameter_m * 6);
this.setMaterial(Databases.findMaterial(Material.Type.BULK, "Delrin")); this.setMaterial(Databases.findMaterial(Material.Type.BULK, "Delrin"));
super.displayOrder_side = 5; // Order for displaying the component in the 2D side view super.displayOrder_side = 14; // Order for displaying the component in the 2D side view
super.displayOrder_back = 5; // Order for displaying the component in the 2D back view super.displayOrder_back = 9; // Order for displaying the component in the 2D back view
} }
public RailButton( final double od, final double ht ) { public RailButton( final double od, final double ht ) {
this(); this();
this.setOuterDiameter( od); this.setOuterDiameter( od);
this.setTotalHeight( ht); this.setTotalHeight( ht);
super.displayOrder_side = 5; // Order for displaying the component in the 2D side view super.displayOrder_side = 14; // Order for displaying the component in the 2D side view
super.displayOrder_back = 5; // Order for displaying the component in the 2D back view super.displayOrder_back = 9; // Order for displaying the component in the 2D back view
} }
public RailButton( final double od, final double id, final double ht, final double flangeThickness, final double _standoff ) { public RailButton( final double od, final double id, final double ht, final double flangeThickness, final double _standoff ) {
@ -90,8 +90,8 @@ public class RailButton extends ExternalComponent implements AnglePositionable,
this.setStandoff( _standoff); this.setStandoff( _standoff);
this.setInstanceSeparation( od*2); this.setInstanceSeparation( od*2);
this.setMaterial(Databases.findMaterial(Material.Type.BULK, "Delrin")); this.setMaterial(Databases.findMaterial(Material.Type.BULK, "Delrin"));
super.displayOrder_side = 5; // Order for displaying the component in the 2D side view super.displayOrder_side = 14; // Order for displaying the component in the 2D side view
super.displayOrder_back = 5; // Order for displaying the component in the 2D back view super.displayOrder_back = 9; // Order for displaying the component in the 2D back view
} }
private static final RailButton make1010Button(){ private static final RailButton make1010Button(){

4
core/src/net/sf/openrocket/rocketcomponent/ShockCord.java
View File

@ -15,8 +15,8 @@ public class ShockCord extends MassObject {
public ShockCord() { public ShockCord() {
material = Application.getPreferences().getDefaultComponentMaterial(ShockCord.class, Material.Type.LINE); material = Application.getPreferences().getDefaultComponentMaterial(ShockCord.class, Material.Type.LINE);
cordLength = 0.4; cordLength = 0.4;
super.displayOrder_side = 13; // Order for displaying the component in the 2D side view super.displayOrder_side = 12; // Order for displaying the component in the 2D side view
super.displayOrder_back = 13; // Order for displaying the component in the 2D back view super.displayOrder_back = 5; // Order for displaying the component in the 2D back view
} }

4
core/src/net/sf/openrocket/rocketcomponent/Streamer.java
View File

@ -21,8 +21,8 @@ public class Streamer extends RecoveryDevice {
public Streamer() { public Streamer() {
this.stripLength = 0.5; this.stripLength = 0.5;
this.stripWidth = 0.05; this.stripWidth = 0.05;
super.displayOrder_side = 12; // Order for displaying the component in the 2D side view super.displayOrder_side = 10; // Order for displaying the component in the 2D side view
super.displayOrder_back = 12; // Order for displaying the component in the 2D back view super.displayOrder_back = 6; // Order for displaying the component in the 2D back view
} }

4
core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java
View File

@ -13,8 +13,8 @@ public class TubeCoupler extends ThicknessRingComponent implements RadialParent
setOuterRadiusAutomatic(true); setOuterRadiusAutomatic(true);
setThickness(0.002); setThickness(0.002);
setLength(0.06); setLength(0.06);
super.displayOrder_side = 8; // Order for displaying the component in the 2D side view super.displayOrder_side = 6; // Order for displaying the component in the 2D side view
super.displayOrder_back = 8; // Order for displaying the component in the 2D back view super.displayOrder_back = 11; // Order for displaying the component in the 2D back view
} }
@Override @Override