From 2c0870fa4d3b5782300f7fb5a25c994756dd34fb Mon Sep 17 00:00:00 2001 From: Sibo Van Gool Date: Tue, 13 Jul 2021 20:58:02 +0200 Subject: [PATCH] [fixes #976] Updated display order v1.1 --- core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java | 2 +- .../net/sf/openrocket/rocketcomponent/CenteringRing.java | 2 +- core/src/net/sf/openrocket/rocketcomponent/InnerTube.java | 2 +- core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java | 2 +- .../net/sf/openrocket/rocketcomponent/MassComponent.java | 4 ++-- core/src/net/sf/openrocket/rocketcomponent/Parachute.java | 2 +- core/src/net/sf/openrocket/rocketcomponent/RailButton.java | 6 +++--- core/src/net/sf/openrocket/rocketcomponent/ShockCord.java | 2 +- core/src/net/sf/openrocket/rocketcomponent/Streamer.java | 2 +- core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java | 2 +- 10 files changed, 13 insertions(+), 13 deletions(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java b/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java index bf3212631..638c0a8d4 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Bulkhead.java @@ -14,7 +14,7 @@ public class Bulkhead extends RadiusRingComponent { setOuterRadiusAutomatic(true); setLength(0.002); super.displayOrder_side = 8; // 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 = 6; // Order for displaying the component in the 2D back view } @Override diff --git a/core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java b/core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java index 40df576a1..cc24ce7e5 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java +++ b/core/src/net/sf/openrocket/rocketcomponent/CenteringRing.java @@ -14,7 +14,7 @@ public class CenteringRing extends RadiusRingComponent { setInnerRadiusAutomatic(true); setLength(0.002); super.displayOrder_side = 7; // 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 = 5; // Order for displaying the component in the 2D back view } private static final Translator trans = Application.getTranslator(); diff --git a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java index 7c1166cd2..bd7cfcd42 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java +++ b/core/src/net/sf/openrocket/rocketcomponent/InnerTube.java @@ -50,7 +50,7 @@ public class InnerTube extends ThicknessRingComponent implements AxialPositionab motors = new MotorConfigurationSet(this); super.displayOrder_side = 5; // 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 = 14; // Order for displaying the component in the 2D back view } diff --git a/core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java b/core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java index e461f51bb..bf90d26e6 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java +++ b/core/src/net/sf/openrocket/rocketcomponent/LaunchLug.java @@ -38,7 +38,7 @@ public class LaunchLug extends ExternalComponent implements AnglePositionable, B thickness = 0.001; length = 0.03; super.displayOrder_side = 15; // 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 = 12; // Order for displaying the component in the 2D back view } diff --git a/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java b/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java index 37c221fb8..7524fc0d4 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java +++ b/core/src/net/sf/openrocket/rocketcomponent/MassComponent.java @@ -42,14 +42,14 @@ public class MassComponent extends MassObject { public MassComponent() { super(); super.displayOrder_side = 13; // 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 = 10; // Order for displaying the component in the 2D back view } public MassComponent(double length, double radius, double mass) { super(length, radius); this.mass = mass; super.displayOrder_side = 13; // 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 = 10; // Order for displaying the component in the 2D back view } diff --git a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java index d73cbc4e0..721d5fab3 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java @@ -24,7 +24,7 @@ public class Parachute extends RecoveryDevice { this.lineMaterial = Application.getPreferences().getDefaultComponentMaterial(Parachute.class, Material.Type.LINE); this.lineLength = 0.3; super.displayOrder_side = 11; // 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 = 9; // Order for displaying the component in the 2D back view } diff --git a/core/src/net/sf/openrocket/rocketcomponent/RailButton.java b/core/src/net/sf/openrocket/rocketcomponent/RailButton.java index 76ecb22d8..9a7a637bf 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/RailButton.java +++ b/core/src/net/sf/openrocket/rocketcomponent/RailButton.java @@ -70,7 +70,7 @@ public class RailButton extends ExternalComponent implements AnglePositionable, this.setInstanceSeparation( this.outerDiameter_m * 6); this.setMaterial(Databases.findMaterial(Material.Type.BULK, "Delrin")); super.displayOrder_side = 14; // 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 = 11; // Order for displaying the component in the 2D back view } public RailButton( final double od, final double ht ) { @@ -78,7 +78,7 @@ public class RailButton extends ExternalComponent implements AnglePositionable, this.setOuterDiameter( od); this.setTotalHeight( ht); super.displayOrder_side = 14; // 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 = 11; // 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 ) { @@ -91,7 +91,7 @@ public class RailButton extends ExternalComponent implements AnglePositionable, this.setInstanceSeparation( od*2); this.setMaterial(Databases.findMaterial(Material.Type.BULK, "Delrin")); super.displayOrder_side = 14; // 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 = 11; // Order for displaying the component in the 2D back view } private static final RailButton make1010Button(){ diff --git a/core/src/net/sf/openrocket/rocketcomponent/ShockCord.java b/core/src/net/sf/openrocket/rocketcomponent/ShockCord.java index 43e79e894..d2f9cc7fa 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/ShockCord.java +++ b/core/src/net/sf/openrocket/rocketcomponent/ShockCord.java @@ -16,7 +16,7 @@ public class ShockCord extends MassObject { material = Application.getPreferences().getDefaultComponentMaterial(ShockCord.class, Material.Type.LINE); cordLength = 0.4; super.displayOrder_side = 12; // 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 = 7; // Order for displaying the component in the 2D back view } diff --git a/core/src/net/sf/openrocket/rocketcomponent/Streamer.java b/core/src/net/sf/openrocket/rocketcomponent/Streamer.java index 4534b17d1..33352590e 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Streamer.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Streamer.java @@ -22,7 +22,7 @@ public class Streamer extends RecoveryDevice { this.stripLength = 0.5; this.stripWidth = 0.05; super.displayOrder_side = 10; // 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 = 8; // Order for displaying the component in the 2D back view } diff --git a/core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java b/core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java index e3057ae21..14b3ad233 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java +++ b/core/src/net/sf/openrocket/rocketcomponent/TubeCoupler.java @@ -14,7 +14,7 @@ public class TubeCoupler extends ThicknessRingComponent implements RadialParent setThickness(0.002); setLength(0.06); super.displayOrder_side = 6; // 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 = 13; // Order for displaying the component in the 2D back view } @Override