From 31bd111a1ebc7400047a784d5b19392212eab335 Mon Sep 17 00:00:00 2001 From: hcraigmiller <68821492+hcraigmiller@users.noreply.github.com> Date: Tue, 19 Apr 2022 03:05:55 -0700 Subject: [PATCH 01/14] Parachute configuration preset input enhancements Presets for selected parachute changes the Component Name to the parachute Description; input the parachute Cd; and input the override mass, checking the mass override box. The parachute packed values are also input, with the diameter of the parachute sized to the inner diameter of the parent component (where nose cones and transitions have inconsistent inner diameters, these components are sized to the largest diameter). Parachutes without a length and diameter (or without those fields) are sized using the default length and diameter. Once created, the parachute length and diameter do not automatically change if the parent diameter is changed, or the parachute is moved to a different component. --- .../sf/openrocket/preset/ComponentPreset.java | 11 ++ .../openrocket/preset/xml/ParachuteDTO.java | 56 +++++++ .../rocketcomponent/BodyComponent.java | 8 +- .../rocketcomponent/MassObject.java | 2 +- .../openrocket/rocketcomponent/Parachute.java | 142 ++++++++++++++++-- .../rocketcomponent/RecoveryDevice.java | 10 +- .../rocketcomponent/RocketComponent.java | 8 +- 7 files changed, 211 insertions(+), 26 deletions(-) diff --git a/core/src/net/sf/openrocket/preset/ComponentPreset.java b/core/src/net/sf/openrocket/preset/ComponentPreset.java index 46df68c88..7309998f8 100644 --- a/core/src/net/sf/openrocket/preset/ComponentPreset.java +++ b/core/src/net/sf/openrocket/preset/ComponentPreset.java @@ -153,6 +153,9 @@ public class ComponentPreset implements Comparable, Serializabl ComponentPreset.DESCRIPTION, ComponentPreset.DIAMETER, ComponentPreset.SIDES, + ComponentPreset.PARACHUTE_CD, + ComponentPreset.PACKED_DIAMETER, + ComponentPreset.PACKED_LENGTH, ComponentPreset.LINE_COUNT, ComponentPreset.LINE_LENGTH, ComponentPreset.LINE_MATERIAL, @@ -208,6 +211,9 @@ public class ComponentPreset implements Comparable, Serializabl public final static TypedKey MASS = new TypedKey("Mass", Double.class, UnitGroup.UNITS_MASS); public final static TypedKey DIAMETER = new TypedKey("Diameter", Double.class, UnitGroup.UNITS_LENGTH); public final static TypedKey SIDES = new TypedKey("Sides", Integer.class); + public static final TypedKey PARACHUTE_CD = new TypedKey("DragCoefficient", Double.class, UnitGroup.UNITS_COEFFICIENT); + public final static TypedKey PACKED_LENGTH = new TypedKey("PackedLength", Double.class, UnitGroup.UNITS_LENGTH); + public final static TypedKey PACKED_DIAMETER = new TypedKey("PackedDiameter", Double.class, UnitGroup.UNITS_LENGTH); public final static TypedKey LINE_COUNT = new TypedKey("LineCount", Integer.class); public final static TypedKey LINE_LENGTH = new TypedKey("LineLength", Double.class, UnitGroup.UNITS_LENGTH); public final static TypedKey LINE_MATERIAL = new TypedKey("LineMaterial", Material.class); @@ -237,6 +243,11 @@ public class ComponentPreset implements Comparable, Serializabl FILLED, DIAMETER, SIDES, + /** DO NOT add new presets to this list without defining table.column + PARACHUTE_CD, + PACKED_LENGTH, + PACKED_DIAMETER, + */ LINE_COUNT, LINE_LENGTH, LINE_MATERIAL, diff --git a/core/src/net/sf/openrocket/preset/xml/ParachuteDTO.java b/core/src/net/sf/openrocket/preset/xml/ParachuteDTO.java index 1bf861570..e7137fe99 100644 --- a/core/src/net/sf/openrocket/preset/xml/ParachuteDTO.java +++ b/core/src/net/sf/openrocket/preset/xml/ParachuteDTO.java @@ -23,6 +23,12 @@ public class ParachuteDTO extends BaseComponentDTO { private AnnotatedLengthDTO diameter; @XmlElement(name = "Sides") private Integer sides; + @XmlElement(name = "PackedDiameter") + private AnnotatedLengthDTO PackedDiameter; + @XmlElement(name = "PackedLength") + private AnnotatedLengthDTO PackedLength; + @XmlElement(name = "DragCoefficient") + private AnnotatedLengthDTO DragCoefficient; @XmlElement(name = "LineCount") private Integer lineCount; @XmlElement(name = "LineLength") @@ -57,6 +63,38 @@ public class ParachuteDTO extends BaseComponentDTO { this.sides = sides; } + + public double getPackedDiameter() { + return PackedDiameter.getValue(); + } + + public void setPackedDiameter(AnnotatedLengthDTO PackedDiameter) { + this.PackedDiameter = PackedDiameter; + } + public void setPackedDiameter(double PackedDiameter) { + this.PackedDiameter = new AnnotatedLengthDTO(PackedDiameter); + } + + public double getPackedLength() { + return PackedLength.getValue(); + } + + public void setPackedLength(AnnotatedLengthDTO PackedLength) { + this.PackedLength = PackedLength; + } + public void setPackedLength(double PackedLength) { + this.PackedLength = new AnnotatedLengthDTO(PackedLength); + } + + public double getDragCoefficient() { + return DragCoefficient.getValue(); + } + + public void setDragCoefficient(AnnotatedLengthDTO DragCoefficient) { + this.DragCoefficient = DragCoefficient; + } + public void setDragCoefficient(double DragCoefficient) { this.DragCoefficient = new AnnotatedLengthDTO(DragCoefficient); } + public Integer getLineCount() { return lineCount; } @@ -102,6 +140,15 @@ public class ParachuteDTO extends BaseComponentDTO { if ( preset.has(ComponentPreset.SIDES)) { setSides(preset.get(ComponentPreset.SIDES)); } + if ( preset.has(ComponentPreset.PACKED_DIAMETER)) { + setPackedDiameter(preset.get(ComponentPreset.PACKED_DIAMETER)); + } + if ( preset.has(ComponentPreset.PACKED_LENGTH)) { + setPackedLength(preset.get(ComponentPreset.PACKED_LENGTH)); + } + if ( preset.has(ComponentPreset.PARACHUTE_CD)) { + setDragCoefficient(preset.get(ComponentPreset.PARACHUTE_CD)); + } if ( preset.has(ComponentPreset.LINE_MATERIAL)) { setLineMaterial(new AnnotatedMaterialDTO(preset.get(ComponentPreset.LINE_MATERIAL))); } @@ -120,6 +167,15 @@ public class ParachuteDTO extends BaseComponentDTO { // need to fix the MATERIAL packed into the componentpreset. props.put(ComponentPreset.TYPE, type); props.put(ComponentPreset.DIAMETER, this.getDiameter()); + if ( this.PackedDiameter != null ) { + props.put(ComponentPreset.PACKED_DIAMETER, this.getPackedDiameter()); + } + if ( this.PackedLength != null ) { + props.put(ComponentPreset.PACKED_LENGTH, this.getPackedLength()); + } + if ( this.PackedLength != null ) { + props.put(ComponentPreset.PARACHUTE_CD, this.getDragCoefficient()); + } props.put(ComponentPreset.LINE_COUNT, this.getLineCount()); if ( this.lineLength != null ) { props.put(ComponentPreset.LINE_LENGTH, this.getLineLength()); diff --git a/core/src/net/sf/openrocket/rocketcomponent/BodyComponent.java b/core/src/net/sf/openrocket/rocketcomponent/BodyComponent.java index 4e0c7b1a4..1ed38b185 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/BodyComponent.java +++ b/core/src/net/sf/openrocket/rocketcomponent/BodyComponent.java @@ -17,7 +17,9 @@ import net.sf.openrocket.rocketcomponent.position.AxialMethod; */ public abstract class BodyComponent extends ExternalComponent { - + + private double InnerRadius; + /** * Default constructor. Sets the relative position to POSITION_RELATIVE_AFTER, * i.e. body components come after one another. @@ -81,5 +83,7 @@ public abstract class BodyComponent extends ExternalComponent { public boolean allowsChildren() { return true; } - + + public double getInnerRadius() { + return InnerRadius; } } diff --git a/core/src/net/sf/openrocket/rocketcomponent/MassObject.java b/core/src/net/sf/openrocket/rocketcomponent/MassObject.java index 125d59279..80ac7c2b6 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/MassObject.java +++ b/core/src/net/sf/openrocket/rocketcomponent/MassObject.java @@ -21,7 +21,7 @@ import net.sf.openrocket.util.MathUtil; */ public abstract class MassObject extends InternalComponent { - private double radius; + protected double radius; private double radialPosition; private double radialDirection; diff --git a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java index 55d634be7..f8b440de2 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java @@ -10,19 +10,19 @@ import net.sf.openrocket.util.MathUtil; public class Parachute extends RecoveryDevice { private static final Translator trans = Application.getTranslator(); - public static final double DEFAULT_CD = 0.8; + public static double DEFAULT_CD = 0.8; private double diameter; - + private final double InitialPackedLength = this.length; + private final double InitialPackedRadius = this.radius; + private Material lineMaterial; private int lineCount = 6; private double lineLength = 0.3; - - + public Parachute() { this.diameter = 0.3; 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 = 9; // Order for displaying the component in the 2D back view } @@ -159,25 +159,135 @@ public class Parachute extends RecoveryDevice { @Override protected void loadFromPreset(ComponentPreset preset) { - if( preset.has( ComponentPreset.DIAMETER )) { - this.diameter = preset.get( ComponentPreset.DIAMETER ); + + // BEGIN Substitute parachute description for component name + if (preset.has(ComponentPreset.DESCRIPTION)) { // If the preset has a Description field + String temporaryName = preset.get(ComponentPreset.DESCRIPTION); + int size = temporaryName.length(); + if (size > 0) { // If the preset description => 1 character + this.name = preset.get(ComponentPreset.DESCRIPTION); + } else { // If the preset description = 0 characters + this.name = getComponentName(); + } + } else { // Fail safe - no preset description field + this.name = getComponentName(); } - if( preset.has( ComponentPreset.LINE_COUNT )) { - this.lineCount = preset.get( ComponentPreset.LINE_COUNT ); + // END Substitute parachute description for component name + + if (preset.has(ComponentPreset.DIAMETER)) { + this.diameter = preset.get(ComponentPreset.DIAMETER); } - if( preset.has( ComponentPreset.LINE_LENGTH )) { - this.lineLength = preset.get( ComponentPreset.LINE_LENGTH ); + + // BEGIN Implement parachute cd + if (preset.has(ComponentPreset.PARACHUTE_CD)) { // If the preset has a DragCoefficient field + if (preset.get(ComponentPreset.PARACHUTE_CD) > 0) { // If the preset DragCoefficient > 0 + cdAutomatic = false; + cd = preset.get(ComponentPreset.PARACHUTE_CD); + } + else { // If the preset DragCoefficient <= 0 + cdAutomatic = true; + cd = Parachute.DEFAULT_CD; + } + } else { // Fail-safe - no preset DragCoefficient field + cdAutomatic = true; + cd = Parachute.DEFAULT_CD; + } + // END Implement parachute cd + + // BEGIN Implement parachute length, diameter, and volume + //// BEGIN Implement parachute packed length + if (preset.has(ComponentPreset.PACKED_LENGTH)) { // If the preset has a PackedLength field + this.PackedLength = preset.get(ComponentPreset.PACKED_LENGTH); + if (PackedLength > 0) { // If the preset PackedLength length > 0 + length = PackedLength; + } + if (PackedLength <= 0) { // If the preset PackedLength length <= 0 + length = InitialPackedLength; + } + } else { // fail-safe - no preset PackedLength field + length = InitialPackedLength; } - if( preset.has( ComponentPreset.LINE_MATERIAL )) { - this.lineMaterial = preset.get( ComponentPreset.LINE_MATERIAL ); + //// END Implement parachute packed length + //// BEGIN Implement parachute packed diameter + if (preset.has(ComponentPreset.PACKED_DIAMETER)) { // If the preset has a PackedDiameter field + this.PackedDiameter = preset.get(ComponentPreset.PACKED_DIAMETER); + if (PackedDiameter > 0) { // If the preset PackedDiameter length > 0 + radius = PackedDiameter / 2; + } + if (PackedDiameter <= 0) { // If the preset PackedDiameter length <= 0 + radius = InitialPackedRadius; + } + } else { // Fail safe - no preset PackedDiameter field + radius = InitialPackedRadius; + } + //// END Implement parachute packed diameter + //// BEGIN Size parachute packed diameter within parent inner diameter + if (length > 0 && radius > 0) { // If preset parachute length & diameter + double innerRadius; + double parachuteVolume; + double trimPackedRadius = .975; + parachuteVolume = (Math.PI * Math.pow(radius, 2) * length); + + if (parent instanceof BodyComponent) { // If parent is a body tube + innerRadius = ((BodyComponent) parent).getInnerRadius(); + radius = innerRadius * trimPackedRadius; + length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); + } + if (parent instanceof InnerTube) { // If parent is an inner tube + innerRadius = ((InnerTube) parent).getInnerRadius(); + radius = innerRadius * trimPackedRadius; + length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); + } + if (parent instanceof TubeCoupler) { // If parent is a tube coupler + innerRadius = ((TubeCoupler) parent).getInnerRadius(); + radius = innerRadius * trimPackedRadius; + length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); + } + if (parent instanceof NoseCone) { // If parent is nose cone + innerRadius = ((NoseCone) parent).getAftRadius(); + radius = innerRadius * Math.pow((trimPackedRadius), 2); + length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); + } + if (parent instanceof Transition) { // If parent is nose cone|transition + double foreRadius = ((Transition) parent).getForeRadius(); + double aftRadius = ((Transition) parent).getAftRadius(); + innerRadius = (Math.max(foreRadius, aftRadius)); + radius = innerRadius * Math.pow((trimPackedRadius), 2); + length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); + } + } + //// END Size parachute packed diameter within parent inner diameter + // END Implement parachute length, diameter, and volume + + // BEGIN Activate Override Mass Preset + if (preset.has(ComponentPreset.MASS)) { // If the preset has a mass field + this.overrideMass = (preset.get(ComponentPreset.MASS)); + if (overrideMass > 0) { // If the preset mass value > 0 + massOverridden = true; + } else { // If the preset mass value <= 0 + this.overrideMass = 0; + massOverridden = false; + } + } else { // Fail safe - no mass value field + this.overrideMass = 0; + massOverridden = false; + } + // END Activate Override Mass Preset + + if (preset.has(ComponentPreset.LINE_COUNT)) { + this.lineCount = preset.get(ComponentPreset.LINE_COUNT); + } + if (preset.has(ComponentPreset.LINE_LENGTH)) { + this.lineLength = preset.get(ComponentPreset.LINE_LENGTH); + } + if (preset.has(ComponentPreset.LINE_MATERIAL)) { + this.lineMaterial = preset.get(ComponentPreset.LINE_MATERIAL); } super.loadFromPreset(preset); } - @Override public Type getPresetType() { - return ComponentPreset.Type.PARACHUTE; + return Type.PARACHUTE; } - } diff --git a/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java b/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java index ec3fe5542..e74fba077 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java +++ b/core/src/net/sf/openrocket/rocketcomponent/RecoveryDevice.java @@ -19,9 +19,13 @@ import net.sf.openrocket.util.MathUtil; * @author Sampo Niskanen */ public abstract class RecoveryDevice extends MassObject implements FlightConfigurableComponent { - - private double cd = Parachute.DEFAULT_CD; - private boolean cdAutomatic = true; + //// + protected double DragCoefficient; + protected double PackedDiameter; + protected double PackedLength; + //// + protected double cd = Parachute.DEFAULT_CD; + protected boolean cdAutomatic = true; private Material.Surface material; diff --git a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java index bcdca0897..af2e046c9 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java +++ b/core/src/net/sf/openrocket/rocketcomponent/RocketComponent.java @@ -90,15 +90,15 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab * Defaults to (0,0,0) */ protected Coordinate position = new Coordinate(); - + // Color of the component, null means to use the default color private Color color = null; private LineStyle lineStyle = null; // Override mass/CG - private double overrideMass = 0; - private boolean massOverridden = false; + protected double overrideMass = 0; + protected boolean massOverridden = false; private double overrideCGX = 0; private boolean cgOverridden = false; private double overrideCD = 0; @@ -108,7 +108,7 @@ public abstract class RocketComponent implements ChangeSource, Cloneable, Iterab // User-given name of the component - private String name = null; + protected String name = null; // User-specified comment private String comment = ""; From 58702782978a60a5a6b52d6706dcb7fecf1ddf52 Mon Sep 17 00:00:00 2001 From: hcraigmiller <68821492+hcraigmiller@users.noreply.github.com> Date: Tue, 19 Apr 2022 03:18:02 -0700 Subject: [PATCH 02/14] Delete Front_Range_Rocket_Recovery_Enhanced.orc --- .../Front_Range_Rocket_Recovery_Enhanced.orc | 579 ------------------ 1 file changed, 579 deletions(-) delete mode 100644 swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery_Enhanced.orc diff --git a/swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery_Enhanced.orc b/swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery_Enhanced.orc deleted file mode 100644 index b583b5143..000000000 --- a/swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery_Enhanced.orc +++ /dev/null @@ -1,579 +0,0 @@ - - - - - - - - 0.1 - - - - - - - Ripstop nylon, lightweight, 3 mil - 0.035653924 - SURFACE - - - - - - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 0.002952756 - LINE - - - - Nylon #400 IIIa Paraline [flat 6.4 mm, 1/4 in] - 0.003718285 - LINE - - - - Spectra #200 [Round 1.5 mm, 1/16 in] - 0.000656168 - LINE - - - - Spectra #400 [Oval 2.55 mm, 3/32in] - 0.001202975 - LINE - - - - - - - - - - Front Range Rocket Recovery - FR3-12-12 - Elliptical 12-Gore Parachute [Cd 1.5 (.35oz) 4.1 in^3]] - Ripstop nylon, lightweight, 3 mil - .00035274 - - - 12 - 1.5 - 12 - 12 - 18 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.4 - 2.8 - - - - Front Range Rocket Recovery - FR3-12-15 - Elliptical 12-Gore Parachute [Cd 1.5 (.49 oz) 4.4 in^3] - Ripstop nylon, lightweight, 3 mil - .00049384 - - - 15 - 1.5 - 12 - 12 - 22.5 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.4 - 3.0 - - - - Front Range Rocket Recovery - FR3-12-18 - Elliptical 12-Gore Parachute [Cd 1.5 (.71 oz) 6.1 in^3] - Ripstop nylon, lightweight, 3 mil - .00070548 - - - 18 - 1.5 - 12 - 12 - 27 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.6 - 3.0 - - - - Front Range Rocket Recovery - FR3-12-24 - Elliptical 12-Gore Parachute [Cd 1.5 (1.13 oz) 7.7 in^3] - Ripstop nylon, lightweight, 3 mil - .00112827 - - - 24 - 1.5 - 12 - 12 - 36 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.6 - 3.9 - - - - Front Range Rocket Recovery - FR3-12-30 - Elliptical 12-Gore Parachute [Cd 1.5 (1.48 oz) 9.7 in^3] - Ripstop nylon, lightweight, 3 mil - .00148151 - - - 30 - 1.5 - 12 - 12 - 45 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.6 - 4.8 - - - - Front Range Rocket Recovery - FR3-12-36 - Elliptical 12-Gore Parachute [Cd 1.5 (1.9 oz) 10.7 in^3] - Ripstop nylon, lightweight, 3 mil - .00190479 - - - 36 - 1.5 - 12 - 12 - 54 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.6 - 5.5 - - - - Front Range Rocket Recovery - FR3-12-42 - Elliptical 12-Gore Parachute [Cd 1.5 (2.65 oz) 4.4 in^3] - Ripstop nylon, lightweight, 3 mil - .00264555 - - - 42 - 1.5 - 12 - 12 - 63 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 5.7 - - - - Front Range Rocket Recovery - FR3-12-48 - Elliptical 12-Gore Parachute [Cd 1.5 (3.25 oz) 18.8 in^3] - Ripstop nylon, lightweight, 3 mil - .00324520 - - - 48 - 1.5 - 12 - 12 - 72 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.2 - 5.1 - - - - Front Range Rocket Recovery - FR3-12-60 - Elliptical 12-Gore Parachute [Cd 1.5 (4.59 oz) 26.9 in^3] - Ripstop nylon, lightweight, 3 mil - .00458561 - - - 48 - 1.5 - 12 - 12 - 90 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.4 - 6.1 - - - - Front Range Rocket Recovery - FR3-16-36 - Elliptical 16-Gore Parachute [Cd 1.5 (2.12 oz) 10.7 in^3] - Ripstop nylon, lightweight, 3 mil - .00211644 - - - 36 - 1.5 - 16 - 16 - 54 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.6 - 5.5 - - - - Front Range Rocket Recovery - FR3-16-42 - Elliptical 16-Gore Parachute [Cd 1.5 (2.65 oz) 15.9 in^3] - Ripstop nylon, lightweight, 3 mil - .00264555 - - - 42 - 1.5 - 16 - 16 - 63 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 5.7 - - - - Front Range Rocket Recovery - FR3-16-48 - Elliptical 16-Gore Parachute [Cd 1.5 (3.39 oz) 18.8 in^3] - Ripstop nylon, lightweight, 3 mil - .00338630 - - - 48 - 1.5 - 16 - 16 - 72 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.2 - 5.1 - - - - Front Range Rocket Recovery - FR3-16-60 - Elliptical 16-Gore Parachute [Cd 1.5 (4.59 oz) 26.9 in^3] - Ripstop nylon, lightweight, 3 mil - .00458561 - - - 60 - 1.5 - 16 - 16 - 90 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.4 - 6.1 - - - - Front Range Rocket Recovery - FR3-16-72 - Elliptical 16-Gore Parachute [Cd 1.5 (6.63 oz) 34.4 in^3] - Ripstop nylon, lightweight, 3 mil - .00663155 - - - 72 - 1.5 - 16 - 16 - 108 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.6 - 6.7 - - - - Front Range Rocket Recovery - FR3-16-84 - Elliptical 16-Gore Parachute [Cd 1.5 (8.29 oz) 42.5 in^3] - Ripstop nylon, lightweight, 3 mil - .00828938 - - - 84 - 1.5 - 16 - 16 - 126 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.8 - 7.1 - - - - Front Range Rocket Recovery - FR3-16-96 - Elliptical 16-Gore Parachute [Cd 1.5 (11.15 oz) 61.3 in^3] - Ripstop nylon, lightweight, 3 mil - .01114657 - - - 96 - 1.5 - 16 - 16 - 144 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.1 - 7.9 - - - - - From 3d6145cebc0ad255fca92c3e9f1d29280e225086 Mon Sep 17 00:00:00 2001 From: hcraigmiller <68821492+hcraigmiller@users.noreply.github.com> Date: Tue, 19 Apr 2022 03:19:38 -0700 Subject: [PATCH 03/14] Delete Front_Range_Rocket_Recovery.orc --- .../Front_Range_Rocket_Recovery.orc | 579 ------------------ 1 file changed, 579 deletions(-) delete mode 100644 swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery.orc diff --git a/swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery.orc b/swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery.orc deleted file mode 100644 index b583b5143..000000000 --- a/swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery.orc +++ /dev/null @@ -1,579 +0,0 @@ - - - - - - - - 0.1 - - - - - - - Ripstop nylon, lightweight, 3 mil - 0.035653924 - SURFACE - - - - - - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 0.002952756 - LINE - - - - Nylon #400 IIIa Paraline [flat 6.4 mm, 1/4 in] - 0.003718285 - LINE - - - - Spectra #200 [Round 1.5 mm, 1/16 in] - 0.000656168 - LINE - - - - Spectra #400 [Oval 2.55 mm, 3/32in] - 0.001202975 - LINE - - - - - - - - - - Front Range Rocket Recovery - FR3-12-12 - Elliptical 12-Gore Parachute [Cd 1.5 (.35oz) 4.1 in^3]] - Ripstop nylon, lightweight, 3 mil - .00035274 - - - 12 - 1.5 - 12 - 12 - 18 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.4 - 2.8 - - - - Front Range Rocket Recovery - FR3-12-15 - Elliptical 12-Gore Parachute [Cd 1.5 (.49 oz) 4.4 in^3] - Ripstop nylon, lightweight, 3 mil - .00049384 - - - 15 - 1.5 - 12 - 12 - 22.5 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.4 - 3.0 - - - - Front Range Rocket Recovery - FR3-12-18 - Elliptical 12-Gore Parachute [Cd 1.5 (.71 oz) 6.1 in^3] - Ripstop nylon, lightweight, 3 mil - .00070548 - - - 18 - 1.5 - 12 - 12 - 27 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.6 - 3.0 - - - - Front Range Rocket Recovery - FR3-12-24 - Elliptical 12-Gore Parachute [Cd 1.5 (1.13 oz) 7.7 in^3] - Ripstop nylon, lightweight, 3 mil - .00112827 - - - 24 - 1.5 - 12 - 12 - 36 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.6 - 3.9 - - - - Front Range Rocket Recovery - FR3-12-30 - Elliptical 12-Gore Parachute [Cd 1.5 (1.48 oz) 9.7 in^3] - Ripstop nylon, lightweight, 3 mil - .00148151 - - - 30 - 1.5 - 12 - 12 - 45 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.6 - 4.8 - - - - Front Range Rocket Recovery - FR3-12-36 - Elliptical 12-Gore Parachute [Cd 1.5 (1.9 oz) 10.7 in^3] - Ripstop nylon, lightweight, 3 mil - .00190479 - - - 36 - 1.5 - 12 - 12 - 54 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.6 - 5.5 - - - - Front Range Rocket Recovery - FR3-12-42 - Elliptical 12-Gore Parachute [Cd 1.5 (2.65 oz) 4.4 in^3] - Ripstop nylon, lightweight, 3 mil - .00264555 - - - 42 - 1.5 - 12 - 12 - 63 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 5.7 - - - - Front Range Rocket Recovery - FR3-12-48 - Elliptical 12-Gore Parachute [Cd 1.5 (3.25 oz) 18.8 in^3] - Ripstop nylon, lightweight, 3 mil - .00324520 - - - 48 - 1.5 - 12 - 12 - 72 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.2 - 5.1 - - - - Front Range Rocket Recovery - FR3-12-60 - Elliptical 12-Gore Parachute [Cd 1.5 (4.59 oz) 26.9 in^3] - Ripstop nylon, lightweight, 3 mil - .00458561 - - - 48 - 1.5 - 12 - 12 - 90 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.4 - 6.1 - - - - Front Range Rocket Recovery - FR3-16-36 - Elliptical 16-Gore Parachute [Cd 1.5 (2.12 oz) 10.7 in^3] - Ripstop nylon, lightweight, 3 mil - .00211644 - - - 36 - 1.5 - 16 - 16 - 54 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.6 - 5.5 - - - - Front Range Rocket Recovery - FR3-16-42 - Elliptical 16-Gore Parachute [Cd 1.5 (2.65 oz) 15.9 in^3] - Ripstop nylon, lightweight, 3 mil - .00264555 - - - 42 - 1.5 - 16 - 16 - 63 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 5.7 - - - - Front Range Rocket Recovery - FR3-16-48 - Elliptical 16-Gore Parachute [Cd 1.5 (3.39 oz) 18.8 in^3] - Ripstop nylon, lightweight, 3 mil - .00338630 - - - 48 - 1.5 - 16 - 16 - 72 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.2 - 5.1 - - - - Front Range Rocket Recovery - FR3-16-60 - Elliptical 16-Gore Parachute [Cd 1.5 (4.59 oz) 26.9 in^3] - Ripstop nylon, lightweight, 3 mil - .00458561 - - - 60 - 1.5 - 16 - 16 - 90 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.4 - 6.1 - - - - Front Range Rocket Recovery - FR3-16-72 - Elliptical 16-Gore Parachute [Cd 1.5 (6.63 oz) 34.4 in^3] - Ripstop nylon, lightweight, 3 mil - .00663155 - - - 72 - 1.5 - 16 - 16 - 108 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.6 - 6.7 - - - - Front Range Rocket Recovery - FR3-16-84 - Elliptical 16-Gore Parachute [Cd 1.5 (8.29 oz) 42.5 in^3] - Ripstop nylon, lightweight, 3 mil - .00828938 - - - 84 - 1.5 - 16 - 16 - 126 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.8 - 7.1 - - - - Front Range Rocket Recovery - FR3-16-96 - Elliptical 16-Gore Parachute [Cd 1.5 (11.15 oz) 61.3 in^3] - Ripstop nylon, lightweight, 3 mil - .01114657 - - - 96 - 1.5 - 16 - 16 - 144 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.1 - 7.9 - - - - - From cf37764f298f08efee109a0985f67dca7f34862b Mon Sep 17 00:00:00 2001 From: hcraigmiller <68821492+hcraigmiller@users.noreply.github.com> Date: Tue, 19 Apr 2022 03:21:17 -0700 Subject: [PATCH 04/14] Delete Fruity_Chutes.orc --- .../legacy_components/Fruity_Chutes.orc | 1275 ----------------- 1 file changed, 1275 deletions(-) delete mode 100644 swing/resources-src/datafiles/legacy_components/Fruity_Chutes.orc diff --git a/swing/resources-src/datafiles/legacy_components/Fruity_Chutes.orc b/swing/resources-src/datafiles/legacy_components/Fruity_Chutes.orc deleted file mode 100644 index 50aa2c02e..000000000 --- a/swing/resources-src/datafiles/legacy_components/Fruity_Chutes.orc +++ /dev/null @@ -1,1275 +0,0 @@ - - - - - - - - - - - - 1.1 - - - - - - - Ripstop nylon, lightweight, 3 mil - 0.035653924 - SURFACE - - - - - - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 0.002952756 - LINE - - - - Nylon #400 IIIa Paraline [flat 6.4 mm, 1/4 in] - 0.003718285 - LINE - - - - Spectra #200 [Round 1.5 mm, 1/16 in] - 0.000656168 - LINE - - - - Spectra #400 [Oval 2.55 mm, 3/32in] - 0.001202975 - LINE - - - - - - - - - - Fruity Chutes - CFC-12-N - Elliptical Parachute [Cd 1.55 (1.3 oz) 7.4 in^3] - Ripstop nylon, lightweight, 3 mil - .03685438 - - - 12 - 1.55 - 8 - 8 - 13.8 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 1.9 - 2.6 - - - - Fruity Chutes - CFC-15-N - Elliptical Parachute [Cd 1.55 (1.5 oz) 8.2 in^3] - Ripstop nylon, lightweight, 3 mil - .04252428 - - - 15 - 1.55 - 8 - 8 - 17.25 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 1.9 - 2.9 - - - - Fruity Chutes - CFC-18-N - Elliptical Parachute [Cd 1.55 (1.7 oz) 9.67 in^3] - Ripstop nylon, lightweight, 3 mil - .04819419 - - - 18 - 1.55 - 8 - 8 - 20.7 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 1.9 - 3.5 - - - - Fruity Chutes - CFC-24-N - Elliptical Parachute [Cd 1.55 (2.2 oz) 12.2 in^3] - Ripstop nylon, lightweight, 3 mil - .06236895 - - - 24 - 1.55 - 8 - 8 - 27.6 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 1.9 - 4.3 - - - - Fruity Chutes - CFC-30-N - Elliptical Parachute [Cd 1.55 (3.1 oz) 15.9 in^3] - Ripstop nylon, lightweight, 3 mil - .08788352 - - - 30 - 1.55 - 8 - 8 - 34.5 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 2.6 - 3 - - - - Fruity Chutes - CFC-36-N - Elliptical Parachute [Cd 1.55 (4.5 oz) 21.2 in^3] - Ripstop nylon, lightweight, 3 mil - 0.12757285 - - - 36 - 1.55 - 12 - 12 - 41.4 - Nylon #400 IIIa Paraline [flat 6.4 mm, 1/4 in] - 2.6 - 4.0 - - - - Fruity Chutes - CFC-42-N - Elliptical Parachute [Cd 1.55 (5.7 oz) 31.9 in^3] - Ripstop nylon, lightweight, 3 mil - 0.16159228 - - - 42 - 1.55 - 12 - 12 - 48.3 - Nylon #400 IIIa Paraline [flat 6.4 mm, 1/4 in] - 2.6 - 6.0 - - - - Fruity Chutes - CFC-48-N - Elliptical Parachute [Cd 1.55 (7.3 oz) 37.2 in^3] - Ripstop nylon, lightweight, 3 mil - .20695152 - - - 48 - 1.55 - 12 - 12 - 55.2 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 2.6 - 7.0 - - - - Fruity Chutes - CFC-60-N - Elliptical Parachute [Cd 1.55 (10.0 oz) 66.0 in^3] - Ripstop nylon, lightweight, 3 mil - .28349523 - - - 60 - 1.55 - 12 - 12 - 69.0 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 4.0 - 5.3 - - - - Fruity Chutes - CFC-72-N - L3 Elliptical Parachute [Cd 1.55 (17.0 oz) 81.7 in^3] - Ripstop nylon, lightweight, 3 mil - .48194189 - - - 72 - 1.55 - 12 - 12 - 82.8 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 4.0 - 6.5 - - - - Fruity Chutes - CFC-84-N - L3 Elliptical Parachute [Cd 1.55 (21.0 oz) 106.8 in^3] - Ripstop nylon, lightweight, 3 mil - .59533998 - - - 84 - 1.55 - 14 - 14 - 96.6 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 4 - 8.5 - - - - Fruity Chutes - CFC-96-N - L3 Elliptical Parachute [Cd 1.55 (30 oz) 151.2 in^3] - Ripstop nylon, lightweight, 3 mil - .85048569 - - - 96 - 1.55 - 16 - 16 - 110.4 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 4 - 12 - - - - Fruity Chutes - CFC-120-N - L3 Elliptical Parachute [Cd 1.55 (36.0 oz) 190.1 in^3] - Ripstop nylon, lightweight, 3 mil - 1.0205828 - - - 120 - 1.55 - 16 - 16 - 138.0 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 5.5 - 8 - - - - - - Fruity Chutes - CFC-12-S - Compact Elliptical Parachute [Cd 1.55 (.85 oz) 4.7 in^3) - Ripstop nylon, lightweight, 3 mil - .02409710 - - - 12 - 1.55 - 8 - 8 - 13.8 - Spectra #400 [Oval 2.55 mm, 3/32in] - 1.6 - 2.4 - - - - Fruity Chutes - CFC-15-S - Compact Elliptical Parachute [Cd 1.55 (1 oz) 6.4 in^3) - Ripstop nylon, lightweight, 3 mil - .02834952 - - - 15 - 1.55 - 8 - 8 - 17.25 - Spectra #400 [Oval 2.55 mm, 3/32in] - 1.6 - 3.2 - - - - Fruity Chutes - CFC-18-S - Compact Elliptical Parachute [Cd 1.55 (1.16 oz) 6.4 in^3) - Ripstop nylon, lightweight, 3 mil - .03288545 - - - 18 - 1.55 - 8 - 8 - 20.7 - Spectra #400 [Oval 2.55 mm, 3/32in] - 1.6 - 3.2 - - - - Fruity Chutes - CFC-24-S - Compact Elliptical Parachute [Cd 1.55 (1.6 oz) 8.8 in^3) - Ripstop nylon, lightweight, 3 mil - .045335924 - - - 24 - 1.55 - 8 - 8 - 27.6 - Spectra #400 [Oval 2.55 mm, 3/32in] - 1.6 - 4.4 - - - - Fruity Chutes - CFC-30-S - Compact Elliptical Parachute [Cd 1.55 (2.1 oz) 11.6 in^3) - Ripstop nylon, lightweight, 3 mil - .05953400 - - - 30 - 1.55 - 8 - 8 - 34.5 - Spectra #400 [Oval 2.55 mm, 3/32in] - 1.9 - 4.1 - - - - Fruity Chutes - CFC-36-S - Compact Elliptical Parachute [Cd 1.55 (3.3 oz) 18.0 in^3) - Ripstop nylon, lightweight, 3 mil - .09355343 - - - 36 - 1.55 - 12 - 12 - 41.4 - Spectra #400 [Oval 2.55 mm, 3/32in] - 2.6 - 3.4 - - - - - - Fruity Chutes - IFC-36-N - Iris Ultra Parachute [Cd 2.2 (5.0 oz) 27.6 in^3] - Ripstop nylon, lightweight, 3 mil - .14174762 - - - 36 - 2.2 - 8 - 8 - 41.4 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 2.6 - 5.2 - - - - Fruity Chutes - IFC-48-N - Iris Ultra Parachute [Cd 2.2 (7.5 oz) 41.4 in^3] - Ripstop nylon, lightweight, 3 mil - .21262142 - - - 48 - 2.2 - 8 - 8 - 55.2 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 2.6 - 7.8 - - - - Fruity Chutes - IFC-60-N - Iris Ultra Parachute [Cd 2.2 (10.9 oz) 60.0 in^3] - Ripstop nylon, lightweight, 3 mil - .30900980 - - - 60 - 2.2 - 12 - 12 - 69 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 3.9 - 5.1 - - - - Fruity Chutes - IFC-72-N - Iris Ultra Parachute [Cd 2.2 (13.4 oz) 74.1 in^3] - Ripstop nylon, lightweight, 3 mil - .37988361 - - - 72 - 2.2 - 12 - 12 - 82.8 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 3.9 - 6.2 - - - - Fruity Chutes - IFC-84-N - Iris Ultra Parachute [Cd 2.2 (19.0 oz) 105.1 in^3] - Ripstop nylon, lightweight, 3 mil - .53864094 - - - 84 - 2.2 - 12 - 12 - 96.6 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 3.9 - 8.8 - - - - Fruity Chutes - IFC-96-N - Iris Ultra Parachute [Cd 2.2 (25.0 oz) 139.5 in^3] - Ripstop nylon, lightweight, 3 mil - .70873808 - - - 96 - 2.2 - 12 - 12 - 110.4 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 4.9 - 7.4 - - - - Fruity Chutes - IFC-120-N - Iris Ultra Parachute [Cd 2.2 (36.0 oz) 199.9 in^3] - Ripstop nylon, lightweight, 3 mil - 1.0205828 - - - 120 - 2.2 - 12 - 12 - 138 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 4.9 - 10.6 - - - - - - Fruity Chutes - IFC-30-SL - Iris Ultra Light Parachute [Cd 2.2 (1.6 oz) 9.0 in^3] - Ripstop nylon, lightweight, 3 mil - .04535924 - - - 30 - 2.2 - 6 - 6 - 34.5 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 3.2 - - - - Fruity Chutes - IFC-36-SL - Iris Ultra Light Parachute [Cd 2.2 (2.1 oz) 11.9 in^3] - Ripstop nylon, lightweight, 3 mil - .05953400 - - - 36 - 2.2 - 6 - 6 - 41.4 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 4.2 - - - - Fruity Chutes - IFC-42-SL - Iris Ultra Light Parachute [Cd 2.2 (2.9 oz) 16.1 in^3] - Ripstop nylon, lightweight, 3 mil - .08221362 - - - 42 - 2.2 - 8 - 8 - 48.3 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 5.7 - - - - - - Fruity Chutes - IFC-30-S - Iris Ultra Compact Parachute [Cd 2.2 (1.88 oz) 10.5 in^3] - Ripstop nylon, lightweight, 3 mil - .05329710 - - - 30 - 2.2 - 8 - 8 - 34.5 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 3.7 - - - - Fruity Chutes - IFC-36-S - Iris Ultra Compact Parachute [Cd 2.2 (2.41 oz) 13.4 in^3] - Ripstop nylon, lightweight, 3 mil - .06832235 - - - 36 - 2.2 - 8 - 8 - 41.4 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.15 - 3.7 - - - - Fruity Chutes - IFC-36-SR - Iris Ultra HP Compact Parachute [Cd 2.2 (2.9 oz) 16.1 in^3] - Ripstop nylon, lightweight, 3 mil - .08221362 - - - 36 - 2.2 - 8 - 8 - 41.4 - Spectra #400 [Oval 2.55 mm, 3/32in] - 2.15 - 4.4 - - - - Fruity Chutes - IFC-48-S - Iris Ultra Compact Parachute [Cd 2.2 (4.3 oz) 26.0 in^3] - Ripstop nylon, lightweight, 3 mil - .12190295 - - - 48 - 2.2 - 8 - 8 - 55.2 - Spectra #400 [Oval 2.55 mm, 3/32in] - 2.6 - 4.9 - - - - Fruity Chutes - IFC-60-S - Iris Ultra Compact Parachute [Cd 2.2 (4.3 oz) 26.0 in^3] - Ripstop nylon, lightweight, 3 mil - .19277676 - - - 60 - 2.2 - 12 - 12 - 69 - Spectra #400 [Oval 2.55 mm, 3/32in] - 3.9 - 3.2 - - - - Fruity Chutes - IFC-72-S - Iris Ultra Compact Parachute [Cd 2.2 (8.8 oz) 49.0 in^3] - Ripstop nylon, lightweight, 3 mil - .24947580 - - - 72 - 2.2 - 12 - 12 - 82.8 - Spectra #400 [Oval 2.55 mm, 3/32in] - 3.9 - 4.1 - - - - Fruity Chutes - IFC-84-S - Iris Ultra Compact Parachute [Cd 2.2 (13.4 oz) 74.1 in^3] - Ripstop nylon, lightweight, 3 mil - .37988361 - - - 84 - 2.2 - 12 - 12 - 96.6 - Spectra #400 [Oval 2.55 mm, 3/32in] - 3.9 - 6.2 - - - - Fruity Chutes - IFC-96-S - Iris Ultra Compact Parachute [Cd 2.2 (16.3 oz) 90.5 in^3] - Ripstop nylon, lightweight, 3 mil - .046209723 - - - 96 - 2.2 - 12 - 12 - 110.4 - Spectra #400 [Oval 2.55 mm, 3/32in] - 4.9 - 4.8 - - - - Fruity Chutes - IFC-120-S - Iris Ultra Compact Parachute [Cd 2.2 (22.0 oz) 128.2 in^3] - Ripstop nylon, lightweight, 3 mil - .62368951 - - - 120 - 2.2 - 12 - 12 - 138 - Spectra #400 [Oval 2.55 mm, 3/32in] - 4.9 - 6.8 - - - - Fruity Chutes - IFC-144-S - Iris Ultra Compact Parachute [Cd 2.2 (31.0 oz) 172.2 in^3] - Ripstop nylon, lightweight, 3 mil - .87883522 - - - 144 - 2.2 - 14 - 14 - 165.0 - Spectra #400 [Oval 2.55 mm, 3/32in] - 5.9 - 6.3 - - - - Fruity Chutes - IFC-168-S - Iris Ultra Compact Parachute [Cd 2.2 (60.0 oz) 245.2 in^3] - Ripstop nylon, lightweight, 3 mil - 1.2473790 - - - 168 - 2.2 - 16 - 16 - 193.2 - Spectra #400 [Oval 2.55 mm, 3/32in] - 7.4 - 5.7 - - - - Fruity Chutes - IFC-192-S - Iris Ultra Compact Parachute [Cd 2.2 (60.0 oz) 322.2 in^3] - Ripstop nylon, lightweight, 3 mil - 1.7009714 - - - 192 - 2.2 - 18 - 18 - 220.8 - Spectra #400 [Oval 2.55 mm, 3/32in] - 7.4 - 7.5 - - - - Fruity Chutes - IFC-240-S - Iris Ultra Compact Parachute [Cd 2.2 (101.0 oz) 472.2 in^3] - Ripstop nylon, lightweight, 3 mil - 2.8633018 - - - 240 - 2.2 - 24 - 24 - 276 - Spectra #400 [Oval 2.55 mm, 3/32in] - 7.5 - 10.7 - - - - - From 28c2799385125610d68d46bc6503a1eea6c4ae18 Mon Sep 17 00:00:00 2001 From: hcraigmiller <68821492+hcraigmiller@users.noreply.github.com> Date: Tue, 19 Apr 2022 03:23:44 -0700 Subject: [PATCH 05/14] Delete Fruity_Chutes_Enhanced.orc --- .../Fruity_Chutes_Enhanced.orc | 1275 ----------------- 1 file changed, 1275 deletions(-) delete mode 100644 swing/resources-src/datafiles/legacy_components/Fruity_Chutes_Enhanced.orc diff --git a/swing/resources-src/datafiles/legacy_components/Fruity_Chutes_Enhanced.orc b/swing/resources-src/datafiles/legacy_components/Fruity_Chutes_Enhanced.orc deleted file mode 100644 index 50aa2c02e..000000000 --- a/swing/resources-src/datafiles/legacy_components/Fruity_Chutes_Enhanced.orc +++ /dev/null @@ -1,1275 +0,0 @@ - - - - - - - - - - - - 1.1 - - - - - - - Ripstop nylon, lightweight, 3 mil - 0.035653924 - SURFACE - - - - - - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 0.002952756 - LINE - - - - Nylon #400 IIIa Paraline [flat 6.4 mm, 1/4 in] - 0.003718285 - LINE - - - - Spectra #200 [Round 1.5 mm, 1/16 in] - 0.000656168 - LINE - - - - Spectra #400 [Oval 2.55 mm, 3/32in] - 0.001202975 - LINE - - - - - - - - - - Fruity Chutes - CFC-12-N - Elliptical Parachute [Cd 1.55 (1.3 oz) 7.4 in^3] - Ripstop nylon, lightweight, 3 mil - .03685438 - - - 12 - 1.55 - 8 - 8 - 13.8 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 1.9 - 2.6 - - - - Fruity Chutes - CFC-15-N - Elliptical Parachute [Cd 1.55 (1.5 oz) 8.2 in^3] - Ripstop nylon, lightweight, 3 mil - .04252428 - - - 15 - 1.55 - 8 - 8 - 17.25 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 1.9 - 2.9 - - - - Fruity Chutes - CFC-18-N - Elliptical Parachute [Cd 1.55 (1.7 oz) 9.67 in^3] - Ripstop nylon, lightweight, 3 mil - .04819419 - - - 18 - 1.55 - 8 - 8 - 20.7 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 1.9 - 3.5 - - - - Fruity Chutes - CFC-24-N - Elliptical Parachute [Cd 1.55 (2.2 oz) 12.2 in^3] - Ripstop nylon, lightweight, 3 mil - .06236895 - - - 24 - 1.55 - 8 - 8 - 27.6 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 1.9 - 4.3 - - - - Fruity Chutes - CFC-30-N - Elliptical Parachute [Cd 1.55 (3.1 oz) 15.9 in^3] - Ripstop nylon, lightweight, 3 mil - .08788352 - - - 30 - 1.55 - 8 - 8 - 34.5 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 2.6 - 3 - - - - Fruity Chutes - CFC-36-N - Elliptical Parachute [Cd 1.55 (4.5 oz) 21.2 in^3] - Ripstop nylon, lightweight, 3 mil - 0.12757285 - - - 36 - 1.55 - 12 - 12 - 41.4 - Nylon #400 IIIa Paraline [flat 6.4 mm, 1/4 in] - 2.6 - 4.0 - - - - Fruity Chutes - CFC-42-N - Elliptical Parachute [Cd 1.55 (5.7 oz) 31.9 in^3] - Ripstop nylon, lightweight, 3 mil - 0.16159228 - - - 42 - 1.55 - 12 - 12 - 48.3 - Nylon #400 IIIa Paraline [flat 6.4 mm, 1/4 in] - 2.6 - 6.0 - - - - Fruity Chutes - CFC-48-N - Elliptical Parachute [Cd 1.55 (7.3 oz) 37.2 in^3] - Ripstop nylon, lightweight, 3 mil - .20695152 - - - 48 - 1.55 - 12 - 12 - 55.2 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 2.6 - 7.0 - - - - Fruity Chutes - CFC-60-N - Elliptical Parachute [Cd 1.55 (10.0 oz) 66.0 in^3] - Ripstop nylon, lightweight, 3 mil - .28349523 - - - 60 - 1.55 - 12 - 12 - 69.0 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 4.0 - 5.3 - - - - Fruity Chutes - CFC-72-N - L3 Elliptical Parachute [Cd 1.55 (17.0 oz) 81.7 in^3] - Ripstop nylon, lightweight, 3 mil - .48194189 - - - 72 - 1.55 - 12 - 12 - 82.8 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 4.0 - 6.5 - - - - Fruity Chutes - CFC-84-N - L3 Elliptical Parachute [Cd 1.55 (21.0 oz) 106.8 in^3] - Ripstop nylon, lightweight, 3 mil - .59533998 - - - 84 - 1.55 - 14 - 14 - 96.6 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 4 - 8.5 - - - - Fruity Chutes - CFC-96-N - L3 Elliptical Parachute [Cd 1.55 (30 oz) 151.2 in^3] - Ripstop nylon, lightweight, 3 mil - .85048569 - - - 96 - 1.55 - 16 - 16 - 110.4 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 4 - 12 - - - - Fruity Chutes - CFC-120-N - L3 Elliptical Parachute [Cd 1.55 (36.0 oz) 190.1 in^3] - Ripstop nylon, lightweight, 3 mil - 1.0205828 - - - 120 - 1.55 - 16 - 16 - 138.0 - Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] - 5.5 - 8 - - - - - - Fruity Chutes - CFC-12-S - Compact Elliptical Parachute [Cd 1.55 (.85 oz) 4.7 in^3) - Ripstop nylon, lightweight, 3 mil - .02409710 - - - 12 - 1.55 - 8 - 8 - 13.8 - Spectra #400 [Oval 2.55 mm, 3/32in] - 1.6 - 2.4 - - - - Fruity Chutes - CFC-15-S - Compact Elliptical Parachute [Cd 1.55 (1 oz) 6.4 in^3) - Ripstop nylon, lightweight, 3 mil - .02834952 - - - 15 - 1.55 - 8 - 8 - 17.25 - Spectra #400 [Oval 2.55 mm, 3/32in] - 1.6 - 3.2 - - - - Fruity Chutes - CFC-18-S - Compact Elliptical Parachute [Cd 1.55 (1.16 oz) 6.4 in^3) - Ripstop nylon, lightweight, 3 mil - .03288545 - - - 18 - 1.55 - 8 - 8 - 20.7 - Spectra #400 [Oval 2.55 mm, 3/32in] - 1.6 - 3.2 - - - - Fruity Chutes - CFC-24-S - Compact Elliptical Parachute [Cd 1.55 (1.6 oz) 8.8 in^3) - Ripstop nylon, lightweight, 3 mil - .045335924 - - - 24 - 1.55 - 8 - 8 - 27.6 - Spectra #400 [Oval 2.55 mm, 3/32in] - 1.6 - 4.4 - - - - Fruity Chutes - CFC-30-S - Compact Elliptical Parachute [Cd 1.55 (2.1 oz) 11.6 in^3) - Ripstop nylon, lightweight, 3 mil - .05953400 - - - 30 - 1.55 - 8 - 8 - 34.5 - Spectra #400 [Oval 2.55 mm, 3/32in] - 1.9 - 4.1 - - - - Fruity Chutes - CFC-36-S - Compact Elliptical Parachute [Cd 1.55 (3.3 oz) 18.0 in^3) - Ripstop nylon, lightweight, 3 mil - .09355343 - - - 36 - 1.55 - 12 - 12 - 41.4 - Spectra #400 [Oval 2.55 mm, 3/32in] - 2.6 - 3.4 - - - - - - Fruity Chutes - IFC-36-N - Iris Ultra Parachute [Cd 2.2 (5.0 oz) 27.6 in^3] - Ripstop nylon, lightweight, 3 mil - .14174762 - - - 36 - 2.2 - 8 - 8 - 41.4 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 2.6 - 5.2 - - - - Fruity Chutes - IFC-48-N - Iris Ultra Parachute [Cd 2.2 (7.5 oz) 41.4 in^3] - Ripstop nylon, lightweight, 3 mil - .21262142 - - - 48 - 2.2 - 8 - 8 - 55.2 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 2.6 - 7.8 - - - - Fruity Chutes - IFC-60-N - Iris Ultra Parachute [Cd 2.2 (10.9 oz) 60.0 in^3] - Ripstop nylon, lightweight, 3 mil - .30900980 - - - 60 - 2.2 - 12 - 12 - 69 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 3.9 - 5.1 - - - - Fruity Chutes - IFC-72-N - Iris Ultra Parachute [Cd 2.2 (13.4 oz) 74.1 in^3] - Ripstop nylon, lightweight, 3 mil - .37988361 - - - 72 - 2.2 - 12 - 12 - 82.8 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 3.9 - 6.2 - - - - Fruity Chutes - IFC-84-N - Iris Ultra Parachute [Cd 2.2 (19.0 oz) 105.1 in^3] - Ripstop nylon, lightweight, 3 mil - .53864094 - - - 84 - 2.2 - 12 - 12 - 96.6 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 3.9 - 8.8 - - - - Fruity Chutes - IFC-96-N - Iris Ultra Parachute [Cd 2.2 (25.0 oz) 139.5 in^3] - Ripstop nylon, lightweight, 3 mil - .70873808 - - - 96 - 2.2 - 12 - 12 - 110.4 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 4.9 - 7.4 - - - - Fruity Chutes - IFC-120-N - Iris Ultra Parachute [Cd 2.2 (36.0 oz) 199.9 in^3] - Ripstop nylon, lightweight, 3 mil - 1.0205828 - - - 120 - 2.2 - 12 - 12 - 138 - Nylon IIIa Paraline [flat 6.4 mm, 1/4 in] - 4.9 - 10.6 - - - - - - Fruity Chutes - IFC-30-SL - Iris Ultra Light Parachute [Cd 2.2 (1.6 oz) 9.0 in^3] - Ripstop nylon, lightweight, 3 mil - .04535924 - - - 30 - 2.2 - 6 - 6 - 34.5 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 3.2 - - - - Fruity Chutes - IFC-36-SL - Iris Ultra Light Parachute [Cd 2.2 (2.1 oz) 11.9 in^3] - Ripstop nylon, lightweight, 3 mil - .05953400 - - - 36 - 2.2 - 6 - 6 - 41.4 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 4.2 - - - - Fruity Chutes - IFC-42-SL - Iris Ultra Light Parachute [Cd 2.2 (2.9 oz) 16.1 in^3] - Ripstop nylon, lightweight, 3 mil - .08221362 - - - 42 - 2.2 - 8 - 8 - 48.3 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 5.7 - - - - - - Fruity Chutes - IFC-30-S - Iris Ultra Compact Parachute [Cd 2.2 (1.88 oz) 10.5 in^3] - Ripstop nylon, lightweight, 3 mil - .05329710 - - - 30 - 2.2 - 8 - 8 - 34.5 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.9 - 3.7 - - - - Fruity Chutes - IFC-36-S - Iris Ultra Compact Parachute [Cd 2.2 (2.41 oz) 13.4 in^3] - Ripstop nylon, lightweight, 3 mil - .06832235 - - - 36 - 2.2 - 8 - 8 - 41.4 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.15 - 3.7 - - - - Fruity Chutes - IFC-36-SR - Iris Ultra HP Compact Parachute [Cd 2.2 (2.9 oz) 16.1 in^3] - Ripstop nylon, lightweight, 3 mil - .08221362 - - - 36 - 2.2 - 8 - 8 - 41.4 - Spectra #400 [Oval 2.55 mm, 3/32in] - 2.15 - 4.4 - - - - Fruity Chutes - IFC-48-S - Iris Ultra Compact Parachute [Cd 2.2 (4.3 oz) 26.0 in^3] - Ripstop nylon, lightweight, 3 mil - .12190295 - - - 48 - 2.2 - 8 - 8 - 55.2 - Spectra #400 [Oval 2.55 mm, 3/32in] - 2.6 - 4.9 - - - - Fruity Chutes - IFC-60-S - Iris Ultra Compact Parachute [Cd 2.2 (4.3 oz) 26.0 in^3] - Ripstop nylon, lightweight, 3 mil - .19277676 - - - 60 - 2.2 - 12 - 12 - 69 - Spectra #400 [Oval 2.55 mm, 3/32in] - 3.9 - 3.2 - - - - Fruity Chutes - IFC-72-S - Iris Ultra Compact Parachute [Cd 2.2 (8.8 oz) 49.0 in^3] - Ripstop nylon, lightweight, 3 mil - .24947580 - - - 72 - 2.2 - 12 - 12 - 82.8 - Spectra #400 [Oval 2.55 mm, 3/32in] - 3.9 - 4.1 - - - - Fruity Chutes - IFC-84-S - Iris Ultra Compact Parachute [Cd 2.2 (13.4 oz) 74.1 in^3] - Ripstop nylon, lightweight, 3 mil - .37988361 - - - 84 - 2.2 - 12 - 12 - 96.6 - Spectra #400 [Oval 2.55 mm, 3/32in] - 3.9 - 6.2 - - - - Fruity Chutes - IFC-96-S - Iris Ultra Compact Parachute [Cd 2.2 (16.3 oz) 90.5 in^3] - Ripstop nylon, lightweight, 3 mil - .046209723 - - - 96 - 2.2 - 12 - 12 - 110.4 - Spectra #400 [Oval 2.55 mm, 3/32in] - 4.9 - 4.8 - - - - Fruity Chutes - IFC-120-S - Iris Ultra Compact Parachute [Cd 2.2 (22.0 oz) 128.2 in^3] - Ripstop nylon, lightweight, 3 mil - .62368951 - - - 120 - 2.2 - 12 - 12 - 138 - Spectra #400 [Oval 2.55 mm, 3/32in] - 4.9 - 6.8 - - - - Fruity Chutes - IFC-144-S - Iris Ultra Compact Parachute [Cd 2.2 (31.0 oz) 172.2 in^3] - Ripstop nylon, lightweight, 3 mil - .87883522 - - - 144 - 2.2 - 14 - 14 - 165.0 - Spectra #400 [Oval 2.55 mm, 3/32in] - 5.9 - 6.3 - - - - Fruity Chutes - IFC-168-S - Iris Ultra Compact Parachute [Cd 2.2 (60.0 oz) 245.2 in^3] - Ripstop nylon, lightweight, 3 mil - 1.2473790 - - - 168 - 2.2 - 16 - 16 - 193.2 - Spectra #400 [Oval 2.55 mm, 3/32in] - 7.4 - 5.7 - - - - Fruity Chutes - IFC-192-S - Iris Ultra Compact Parachute [Cd 2.2 (60.0 oz) 322.2 in^3] - Ripstop nylon, lightweight, 3 mil - 1.7009714 - - - 192 - 2.2 - 18 - 18 - 220.8 - Spectra #400 [Oval 2.55 mm, 3/32in] - 7.4 - 7.5 - - - - Fruity Chutes - IFC-240-S - Iris Ultra Compact Parachute [Cd 2.2 (101.0 oz) 472.2 in^3] - Ripstop nylon, lightweight, 3 mil - 2.8633018 - - - 240 - 2.2 - 24 - 24 - 276 - Spectra #400 [Oval 2.55 mm, 3/32in] - 7.5 - 10.7 - - - - - From c3e1e85f1d29e5a3cc784c76712a75c5f1896aef Mon Sep 17 00:00:00 2001 From: hcraigmiller <68821492+hcraigmiller@users.noreply.github.com> Date: Tue, 19 Apr 2022 03:24:06 -0700 Subject: [PATCH 06/14] Delete Rocketman_Enhanced.orc --- .../legacy_components/Rocketman_Enhanced.orc | 2094 ----------------- 1 file changed, 2094 deletions(-) delete mode 100644 swing/resources-src/datafiles/legacy_components/Rocketman_Enhanced.orc diff --git a/swing/resources-src/datafiles/legacy_components/Rocketman_Enhanced.orc b/swing/resources-src/datafiles/legacy_components/Rocketman_Enhanced.orc deleted file mode 100644 index 0deb3ae79..000000000 --- a/swing/resources-src/datafiles/legacy_components/Rocketman_Enhanced.orc +++ /dev/null @@ -1,2094 +0,0 @@ - - - - - - - 0.1 - - - - - - - Ripstop nylon, ultra lightweight, 2 mil - 0.035653924 - SURFACE - - - - Ripstop nylon, lightweight, 3 mil - 0.035653924 - SURFACE - - - - Ripstop nylon, 1.9 oz 5 mil - 0.058906483 - SURFACE - - - - Ripstop nylon, bulletproof 3 mil - 0.035653924 - SURFACE - - - - - - Spectra #200 [Round 1.5 mm, 1/16 in] - 0.000656168 - LINE - - - - Spectra #400 [Oval 2.55 mm, 3/32in] - 0.001202975 - LINE - - - - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 0.003499563 - LINE - - - - Braided Nylon [ 9.5 mm, 3/8 in] - 0.009623797 - LINE - - - - Braided Polyester [Flat 9.5 mm, 3/8 in] - 0.012029746 - LINE - - - - Tubular Nylon #2500 [12.7 mm, 1/2 in] - 0.012685914 - LINE - - - - - - - - - - Rocketman - PA-02 - PolyConical Parachute [Cd .99 (1.23 oz) 7.23 in^3] - Ripstop nylon, lightweight, 3 mil - .03486991 - - - 24 - .99 - 10 - 10 - 28.8 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.0 - 2.3 - - - - Rocketman - PA-03 - PolyConical Parachute [Cd .99 (2.22 oz) 13.05 in^3] - Ripstop nylon, lightweight, 3 mil - .062935934 - - - 36 - .99 - 10 - 10 - 43.2 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.0 - 4.15 - - - - Rocketman - PA-04 - PolyConical Parachute [Cd .99 (3.76 oz) 22.1 in^3] - Ripstop nylon, lightweight, 3 mil - .106594195 - - - 48 - .99 - 12 - 12 - 57.6 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.0 - 7.03 - - - - Rocketman - PA-05 - PolyConical Parachute [Cd .99 (5.33 oz) 31.34 in^3] - Ripstop nylon, lightweight, 3 mil - .151102942 - - - 60 - .99 - 12 - 12 - 72 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.0 - 4.43 - - - - Rocketman - PA-06 - PolyConical Parachute [Cd .99 (7.58 oz) 31.34 in^3] - Ripstop nylon, lightweight, 3 mil - .214889362 - - - 72 - .99 - 14 - 14 - 86.4 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.0 - 4.43 - - - - Rocketman - PA-07 - PolyConical Parachute [Cd .99 (15.62 oz) 91.84 in^3] - Ripstop nylon, lightweight, 3 mil - .442819502 - - - 84 - .99 - 14 - 14 - 100.8 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 7.30 - - - - Rocketman - PA-08 - PolyConical Parachute [Cd .99 (18.86 oz) 110.89 in^3] - Ripstop nylon, lightweight, 3 mil - .534671947 - - - 96 - .99 - 14 - 14 - 115.2 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 8.82 - - - - Rocketman - PA-09 - PolyConical Parachute [Cd .99 (22.36 oz) 131.47 in^3] - Ripstop nylon, lightweight, 3 mil - .633895267 - - - 108 - .99 - 14 - 14 - 129.6 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 10.46 - - - - Rocketman - PA-10 - PolyConical Parachute [Cd .99 (22.36 oz) 131.47 in^3] - Ripstop nylon, lightweight, 3 mil - .794637046 - - - 120 - .99 - 16 - 16 - 144 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 13.11 - - - - Rocketman - PA-12 - PolyConical Parachute [Cd .99 (22.36 oz) 131.47 in^3] - Ripstop nylon, lightweight, 3 mil - 1.105347785 - - - 144 - .99 - 18 - 18 - 172.8 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 18.24 - - - - Rocketman - PA-14 - PolyConical Parachute [Cd .99 (22.36 oz) 131.47 in^3] - Ripstop nylon, lightweight, 3 mil - 1.542497383 - - - 168 - .99 - 22 - 22 - 201.6 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 26.45 - - - - - - - - Rocketman - HX-009 - Hexagonal Parachute [Cd .75 (.3895 oz) 1.94 in^3] - Ripstop nylon, lightweight, 3 mil - .011042138 - - - 9 - .75 - 6 - 6 - 11.25 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 1.0 - 2.47 - - - - Rocketman - HX-012 - Hexagonal Parachute [Cd .75 (.4651 oz) 2.32 in^3] - Ripstop nylon, lightweight, 3 mil - .013185362 - - - 12 - .75 - 6 - 6 - 15 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 1.0 - 2.95 - - - - Rocketman - HX-015 - Hexagonal Parachute [Cd .75 (.5541 oz) 2.77 in^3] - Ripstop nylon, lightweight, 3 mil - .015708469 - - - 15 - .75 - 6 - 6 - 18.75 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 1.0 - 3.52 - - - - Rocketman - HX-018 - Hexagonal Parachute [Cd .75 (.6560 oz) 3.28 in^3] - Ripstop nylon, lightweight, 3 mil - .018597285 - - - 18 - .75 - 6 - 6 - 22.5 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 2.0 - 1.04 - - - - Rocketman - HX-024 - Hexagonal Parachute [Cd .75 (.93 oz) 4.65 in^3] - Ripstop nylon, lightweight, 3 mil - .026365054 - - - 24 - .75 - 6 - 6 - 30 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 2.0 - 1.48 - - - - Rocketman - HX-030 - Hexagonal Parachute [Cd .75 (1.228 oz) 6.14 in^3] - Ripstop nylon, lightweight, 3 mil - .034813211 - - - 30 - .75 - 6 - 6 - 37.5 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 2.0 - 1.95 - - - - Rocketman - HX-036 - Hexagonal Parachute [Cd .75 (1.578 oz) 7.89 in^3] - Ripstop nylon, lightweight, 3 mil - .044735543 - - - 36 - .75 - 6 - 6 - 45 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 2.0 - 2.51 - - - - Rocketman - HX-042 - Hexagonal Parachute [Cd .75 (1.578 oz) 7.89 in^3] - Ripstop nylon, lightweight, 3 mil - .056982535 - - - 42 - .75 - 6 - 6 - 52.5 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 2.0 - 3.20 - - - - Rocketman - HX-048 - Hexagonal Parachute [Cd .75 (2.467 oz) 12.33 in^3] - Ripstop nylon, lightweight, 3 mil - .069938266 - - - 48 - .75 - 6 - 6 - 60 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 2.0 - 3.92 - - - - Rocketman - HX-060 - Hexagonal Parachute [Cd .75 (3.568 oz) 17.84 in^3] - Ripstop nylon, lightweight, 3 mil - .101151087 - - - 60 - .75 - 6 - 6 - 75 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 2.0 - 5.67 - - - - Rocketman - HX-072 - Hexagonal Parachute [Cd .75 (4.88 oz) 24.4 in^3] - Ripstop nylon, lightweight, 3 mil - .138345658 - - - 72 - .75 - 6 - 6 - 90 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 3.0 - 3.45 - - - - Rocketman - HX-084 - Hexagonal Parachute [Cd .75 (6.4 oz) 32.01 in^3] - Ripstop nylon, lightweight, 3 mil - .181436928 - - - 84 - .75 - 6 - 6 - 105 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 3.0 - 4.52 - - - - Rocketman - HX-096 - Hexagonal Parachute [Cd .75 (8.1 oz) 40.53 in^3] - Ripstop nylon, lightweight, 3 mil - .229631112 - - - 96 - .75 - 6 - 6 - 120 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 3.0 - 5.73 - - - - Rocketman - HX-120 - Hexagonal Parachute [Cd .75 (12.01 oz) 60.06 in^3] - Ripstop nylon, lightweight, 3 mil - .340477735 - - - 120 - .75 - 6 - 6 - 150 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 3.0 - 849 - - - - - - - - Rocketman - TC-12 - TARC Parachute [Cd 1.5 (9.0 g) 1.77 in^3] - Ripstop nylon, lightweight, 3 mil - .009 - - - 12 - 1.5 - 4 - 4 - 12 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 1 - 2.25 - - - - Rocketman - TC-15 - TARC Parachute [Cd 1.5 (10.0 g) 1.84 in^3] - Ripstop nylon, lightweight, 3 mil - .010 - - - 15 - 1.5 - 4 - 4 - 15 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 1 - 2.75 - - - - Rocketman - TC-18 - TARC Parachute [Cd 1.5 (15.0 g) 2.62 in^3] - Ripstop nylon, lightweight, 3 mil - .015 - - - 18 - 1.5 - 4 - 4 - 18 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 1 - 3.75 - - - - Rocketman - TC-24 - TARC Parachute [Cd 1.5 (15.0 g) 2.62 in^3] - Ripstop nylon, lightweight, 3 mil - .015 - - - 24 - 1.5 - 4 - 4 - 24 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 1 - 5.75 - - - - Rocketman - TC-30 - TARC Parachute [Cd 1.5 (34.0 g) 5.69 in^3] - Ripstop nylon, lightweight, 3 mil - .034 - - - 30 - 1.5 - 4 - 4 - 30 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 1 - 7.25 - - - - - - - - Rocketman - EL-024 - Elliptical Parachute [Cd 1.6 (2.1 oz) 12.16 in^3] - Ripstop nylon, lightweight, 3 mil - .059533992 - - - 24 - 1.6 - 8 - 8 - 24 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 1.9 - 4.29 - - - - Rocketman - EL-036 - Elliptical Parachute [Cd 1.6 (4.4 oz) 24.0 in^3] - Ripstop nylon, lightweight, 3 mil - .124737888 - - - 36 - 1.6 - 8 - 8 - 36 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 2.6 - 4.52 - - - - Rocketman - EL-048 - Elliptical Parachute [Cd 1.6 (7.2 oz) 36.0 in^3] - Ripstop nylon, lightweight, 3 mil - .204116544 - - - 48 - 1.6 - 8 - 8 - 48 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 2.6 - 6.78 - - - - Rocketman - EL-060 - Elliptical Parachute [Cd 1.6 (9.9 oz) 50.5 in^3] - Ripstop nylon, lightweight, 3 mil - .280660248 - - - 60 - 1.6 - 12 - 12 - 60 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 4.0 - 4.01 - - - - Rocketman - EL-072 - Elliptical Parachute [Cd 1.6 (12.6 oz) 63.0 in^3] - Ripstop nylon, lightweight, 3 mil - .357203952 - - - 72 - 1.6 - 12 - 12 - 72 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 4.0 - 5.01 - - - - Rocketman - EL-084 - Elliptical Parachute [Cd 1.6 (15.3 oz) 76.5 in^3] - Ripstop nylon, lightweight, 3 mil - .433737656 - - - 84 - 1.6 - 12 - 12 - 84 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 4.0 - 6.08 - - - - Rocketman - EL-096 - Elliptical Parachute [Cd 1.6 (18.5 oz) 92.5 in^3] - Ripstop nylon, lightweight, 3 mil - .52446612 - - - 96 - 1.6 - 12 - 12 - 96 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 4.0 - 7.36 - - - - Rocketman - EL-120 - Elliptical Parachute [Cd 1.6 (25.0 oz) 140.0 in^3] - Ripstop nylon, lightweight, 3 mil - .708738 - - - 120 - 1.6 - 12 - 12 - 120 - Braided Nylon #250 [Flat 6.35 mm, 1/4 in] - 4.0 - 11.19 - - - - - - - - Rocketman - BA-01 - Ballistic Parachute [Cd .97 (3.3 oz) 28.27 in^3] - Ripstop nylon, bulletproof 3 mil - .093553416 - - - 12 - .97 - 4 - 4 - 12 - Tubular Nylon #2500 [12.7 mm, 1/2 in] - 3.0 - 4.0 - - - - Rocketman - BA-02 - Ballistic Parachute [Cd .97 (6.0 oz) 62.83 in^3] - Ripstop nylon, bulletproof 3 mil - .17009712 - - - 24 - .97 - 4 - 4 - 24 - Tubular Nylon #2500 [12.7 mm, 1/2 in] - 4.0 - 5.0 - - - - Rocketman - BA-03 - Ballistic Parachute [Cd .97 (11.3 oz) 87.96 in^3] - Ripstop nylon, bulletproof 3 mil - .320349576 - - - 36 - .97 - 4 - 4 - 36 - Tubular Nylon #2500 [12.7 mm, 1/2 in] - 4.0 - 7.0 - - - - Rocketman - BA-04 - Ballistic Parachute [Cd .97 (18.0 oz) 106.81 in^3] - Ripstop nylon, bulletproof 3 mil - .51029136 - - - 48 - .97 - 4 - 4 - 48 - Tubular Nylon #2500 [12.7 mm, 1/2 in] - 4.0 - 8.5 - - - - Rocketman - BA-05 - Ballistic Parachute [Cd .97 (23.6 oz) 163.36 in^3] - Ripstop nylon, bulletproof 3 mil - .669048672 - - - 60 - .97 - 4 - 4 - 60 - Tubular Nylon #2500 [12.7 mm, 1/2 in] - 4.0 - 13.0 - - - - Rocketman - BA-06 - Ballistic Parachute [Cd .97 (31.6 oz) 213.63 in^3] - Ripstop nylon, bulletproof 3 mil - .895844832 - - - 72 - .97 - 4 - 4 - 72 - Tubular Nylon #2500 [12.7 mm, 1/2 in] - 4.0 - 17.0 - - - - Rocketman - BA-07 - Ballistic Parachute [Cd .97 (40.0 oz) 367.57 in^3] - Ripstop nylon, bulletproof 3 mil - 1.1339808 - - - 84 - .97 - 4 - 4 - 84 - Tubular Nylon #2500 [12.7 mm, 1/2 in] - 6.0 - 13.0 - - - - Rocketman - BA-12 - Ballistic Parachute [Cd .97 (160.0 oz) 890.64 in^3] - Ripstop nylon, bulletproof 3 mil - 4.5359232 - - - 144 - .97 - 4 - 4 - 144 - Tubular Nylon #2500 [12.7 mm, 1/2 in] - 8.0 - 17.7 - - - - - - - - Rocketman - PX-01 - Pro X Drogue Parachute [Cd .97 (1.6 oz) 11.0 in^3] - Ripstop nylon, 1.9 oz 5 mil - .045359232 - - - 12 - .97 - 4 - 4 - 12 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 2.0 - 3.5 - - - - Rocketman - PX-02 - Pro X Drogue Parachute [Cd .97 (2.7 oz) 18.85 in^3] - Ripstop nylon, 1.9 oz 5 mil - .076543704 - - - 24 - .97 - 4 - 4 - 24 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 2.0 - 6.0 - - - - Rocketman - PX-03 - Pro X Drogue Parachute [Cd .97 (4.5 oz) 42.41 in^3] - Ripstop nylon, 1.9 oz 5 mil - .12757284 - - - 36 - .97 - 4 - 4 - 36 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 2.0 - 8.0 - - - - Rocketman - PX-04 - Pro X Drogue Parachute [Cd .97 (7.7 oz) 56.54 in^3] - Ripstop nylon, 1.9 oz 5 mil - .218291304 - - - 48 - .97 - 4 - 4 - 48 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 3.0 - 8.0 - - - - Rocketman - PX-05 - Pro X Drogue Parachute [Cd .97 (8.5 oz) 28.27 in^3] - Ripstop nylon, 1.9 oz 5 mil - .24097092 - - - 60 - .97 - 4 - 4 - 60 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 3.0 - 9.0 - - - - Rocketman - PX-06 - Pro X Drogue Parachute [Cd .97 (12.2 oz) 87.96 in^3] - Ripstop nylon, 1.9 oz 5 mil - .345864144 - - - 72 - .97 - 4 - 4 - 72 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 4.0 - 7.0 - - - - Rocketman - PX-07 - Pro X Drogue Parachute [Cd .97 (14.3 oz) 113.10 in^3] - Ripstop nylon, 1.9 oz 5 mil - .405398136 - - - 84 - .97 - 4 - 4 - 84 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 4.0 - 9.0 - - - - Rocketman - PX-08 - Pro X Drogue Parachute [Cd .97 (3.3 oz) 28.27 in^3] - Ripstop nylon, 1.9 oz 5 mil - .518796216 - - - 96 - .97 - 4 - 4 - 96 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 4.0 - 10.0 - - - - Rocketman - PX-09 - Pro X Drogue Parachute [Cd .97 (21.3 oz) 150.80 in^3] - Ripstop nylon, 1.9 oz 5 mil - .603844776 - - - 108 - .97 - 4 - 4 - 108 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 4.0 - 12.0 - - - - Rocketman - PX-10 - Pro X Drogue Parachute [Cd .97 (22.8 oz) 163.36 in^3] - Ripstop nylon, 1.9 oz 5 mil - .646369056 - - - 120 - .97 - 4 - 4 - 120 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 4.0 - 13.0 - - - - Rocketman - PX-12 - Pro X Drogue Parachute [Cd .97 (29.4 oz) 188.50 in^3] - Ripstop nylon, 1.9 oz 5 mil - .833475888 - - - 144 - .97 - 4 - 4 - 144 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 4.0 - 15.0 - - - - Rocketman - PX-14 - Pro X Drogue Parachute [Cd .97 (40.0 oz) 339.29 in^3] - Ripstop nylon, 1.9 oz 5 mil - 1.1339808 - - - 168 - .97 - 4 - 4 - 168 - Braided Polyester [Flat 9.5 mm, 3/8 in] - 6.0 - 12.0 - - - - - - - - Rocketman - DG-02 - Disk Gap Parachute [Cd .85 (1.6 oz) 11.0 in^3] - Ripstop nylon, lightweight, 3 mil - .045359232 - - - 24 - .85 - 10 - 10 - 28.8 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.0 - 2.3 - - - - Rocketman - DG-03 - Disk Gap Parachute [Cd .85 (2.22 oz) 13.05 in^3] - Ripstop nylon, lightweight, 3 mil - .062935934 - - - 36 - .85 - 10 - 10 - 43.2 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.0 - 4.15 - - - - Rocketman - DG-04 - Disk Gap Parachute [Cd .85 (3.76 oz) 22.10 in^3] - Ripstop nylon, lightweight, 3 mil - .106594195 - - - 48 - .85 - 12 - 12 - 57.6 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2.0 - 7.03 - - - - Rocketman - DG-05 - Disk Gap Parachute [Cd .85 (5.33 oz) 31.34 in^3] - Ripstop nylon, lightweight, 3 mil - .151102942 - - - 60 - .85 - 12 - 12 - 72 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.0 - 4.43 - - - - Rocketman - DG-06 - Disk Gap Parachute [Cd .85 (7.58 oz) 31.34 in^3] - Ripstop nylon, lightweight, 3 mil - .214889362 - - - 72 - .85 - 14 - 14 - 86.4 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.0 - 4.43 - - - - Rocketman - DG-07 - Disk Gap Parachute [Cd .85 (15.62 oz) 91.84 in^3] - Ripstop nylon, lightweight, 3 mil - .442819502 - - - 84 - .85 - 14 - 14 - 100.8 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 7.3 - - - - Rocketman - DG-08 - Disk Gap Parachute [Cd .85 (18.86 oz) 110.89 in^3] - Ripstop nylon, lightweight, 3 mil - .534671947 - - - 96 - .85 - 14 - 14 - 115.2 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 8.82 - - - - Rocketman - DG-09 - Disk Gap Parachute [Cd .85 (22.36 oz) 131.47 in^3] - Ripstop nylon, lightweight, 3 mil - .633895267 - - - 108 - .85 - 14 - 14 - 129.6 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 10.46 - - - - Rocketman - DG-10 - Disk Gap Parachute [Cd .85 (28.03 oz) 164.81 in^3] - Ripstop nylon, lightweight, 3 mil - .794637046 - - - 120 - .85 - 16 - 16 - 144.6 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 13.11 - - - - Rocketman - DG-12 - Disk Gap Parachute [Cd .85 (38.99 oz) 229.26 in^3] - Ripstop nylon, lightweight, 3 mil - 1.105347785 - - - 144 - .85 - 18 - 18 - 172.8 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 18.24 - - - - Rocketman - DG-14 - Disk Gap Parachute [Cd .85 (54.41 oz) 319.93 in^3] - Ripstop nylon, lightweight, 3 mil - 1.542497383 - - - 168 - .85 - 22 - 22 - 201.6 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 26.45 - - - - - - - - Rocketman - LA-03 - Light Annular Parachute [Cd .85 (3.5 oz) 20.58 in^3] - Ripstop nylon, lightweight, 3 mil - .09922322 - - - 36 - .85 - 12 - 12 - 36 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.0 - 2.91 - - - - Rocketman - LA-04 - Light Annular Parachute [Cd .85 (4.7 oz) 27.63 in^3] - Ripstop nylon, lightweight, 3 mil - .133242744 - - - 48 - .85 - 12 - 12 - 48 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.0 - 3.9 - - - - Rocketman - LA-05 - Light Annular Parachute [Cd .85 (6.2 oz) 36.45 in^3] - Ripstop nylon, lightweight, 3 mil - .175767024 - - - 60 - .85 - 14 - 14 - 60 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.0 - 5.15 - - - - Rocketman - LA-06 - Light Annular Parachute [Cd .85 (7.5 oz) 44.10 in^3] - Ripstop nylon, lightweight, 3 mil - .2126214 - - - 72 - .85 - 14 - 14 - 72 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.0 - 6.23 - - - - Rocketman - LA-07 - Light Annular Parachute [Cd .85 (8.9 oz) 52.33 in^3] - Ripstop nylon, lightweight, 3 mil - .252310728 - - - 84 - .85 - 16 - 16 - 84 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.0 - 7.4 - - - - Rocketman - LA-08 - Light Annular Parachute [Cd .85 (10.1 oz) 59.28 in^3] - Ripstop nylon, lightweight, 3 mil - .286330152 - - - 96 - .85 - 16 - 16 - 96 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 4.72 - - - - Rocketman - LA-09 - Light Annular Parachute [Cd .85 (11.6 oz) 68.20 in^3] - Ripstop nylon, lightweight, 3 mil - .328854432 - - - 108 - .85 - 18 - 18 - 108 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 5.42 - - - - Rocketman - LA-10 - Light Annular Parachute [Cd .85 (12.9 oz) 75.85 in^3] - Ripstop nylon, lightweight, 3 mil - .365708808 - - - 120 - .85 - 18 - 18 - 120 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 6.03 - - - - Rocketman - LA-12 - Light Annular Parachute [Cd .85 (15.6 oz) 91.72 in^3] - Ripstop nylon, lightweight, 3 mil - .442252512 - - - 144 - .85 - 20 - 20 - 144 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 7.29 - - - - Rocketman - LA-14 - Light Annular Parachute [Cd .85 (18.1 oz) 106.42 in^3] - Ripstop nylon, lightweight, 3 mil - .513126312 - - - 168 - .85 - 20 - 20 - 168 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 8.46 - - - - Rocketman - LA-16 - Light Annular Parachute [Cd .85 (20.9 oz) 122.89 in^3] - Ripstop nylon, lightweight, 3 mil - .592504968 - - - 192 - .85 - 22 - 22 - 192 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4.0 - 9.77 - - - - - - - - Rocketman - LP-024 - Light HP Parachute [Cd 2.2 (.7 oz) 2.331 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .019844664 - - - 24 - 2.2 - 8 - 8 - 24 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.375 - 1.569 - - - - Rocketman - LP-036 - Light HP Parachute [Cd 2.2 (1.5 oz) 4.57 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .04252428 - - - 36 - 2.2 - 8 - 8 - 36 - Spectra #200 [Round 1.5 mm, 1/16 in] - 1.375 - 3.08 - - - - Rocketman - LP-048 - Light HP Parachute [Cd 2.2 (2.2 oz) 6.66 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .062368944 - - - 48 - 2.2 - 8 - 8 - 48 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2 - 2.11 - - - - Rocketman - LP-060 - Light HP Parachute [Cd 2.2 (3.4 oz) 11.322 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .096388368 - - - 60 - 2.2 - 12 - 12 - 60 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2 - 3.6 - - - - Rocketman - LP-072 - Light HP Parachute [Cd 2.2 (4.6 oz) 15.318 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .130407792 - - - 72 - 2.2 - 12 - 12 - 72 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2 - 4.875 - - - - Rocketman - LP-084 - Light HP Parachute [Cd 2.2 (5.95 oz) 19.813 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .168679644 - - - 84 - 2.2 - 12 - 12 - 84 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.25 - 2.388 - - - - Rocketman - LP-096 - Light HP Parachute [Cd 2.2 (7.3 oz) 24.30 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .206951496 - - - 96 - 2.2 - 12 - 12 - 84 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.25 - 2.929 - - - - Rocketman - LP-120 - Light HP Parachute [Cd 2.2 (10.4 oz) 34.62 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .294835008 - - - 120 - 2.2 - 12 - 12 - 120 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.25 - 4.12 - - - - Rocketman - LP-144 - Light HP Parachute [Cd 2.2 (12.4 oz) 41.29 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .351534048 - - - 144 - 2.2 - 14 - 14 - 144 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.25 - 4.977 - - - - Rocketman - LP-168 - Light HP Parachute [Cd 2.2 (14.6 oz) 48.61 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .413902992 - - - 168 - 2.2 - 16 - 16 - 168 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.25 - 5.85 - - - - Rocketman - LP-192 - Light HP Parachute [Cd 2.2 (17.7 oz) 58.94 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .501786504 - - - 192 - 2.2 - 18 - 18 - 192 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3.25 - 7.1 - - - - - - - - Rocketman - LS-01 - Light Std Parabolic Parachute [Cd .97 (.32 oz)1.878 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .009071846 - - - 12 - .97 - 4 - 4 - 12 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2 - .6 - - - - Rocketman - LS-02 - Light Std Parabolic Parachute [Cd .97 (.664oz) 3.78 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .018824081 - - - 24 - .97 - 4 - 4 - 24 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2 - 1.2 - - - - Rocketman - LS-03 - Light Std Parabolic Parachute [Cd .97 (1.112 oz) 6.52 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .031524666 - - - 36 - .97 - 4 - 4 - 36 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2 - 2.08 - - - - Rocketman - LS-04 - Light Std Parabolic Parachute [Cd .97 (1.67 oz) 9.8 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .047343698 - - - 48 - .97 - 4 - 4 - 48 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2 - 3.12 - - - - Rocketman - LS-05 - Light Std Parabolic Parachute [Cd .97 (2.27 oz) 12.70 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .06435341 - - - 60 - .97 - 4 - 4 - 60 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2 - 4.04 - - - - Rocketman - LS-06 - Light Std Parabolic Parachute [Cd .97 (3.4 oz) 12.70 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .096388368 - - - 72 - .97 - 4 - 4 - 72 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2 - 4.04 - - - - Rocketman - LS-07 - Light Std Parabolic Parachute [Cd .97 (3.72 oz) 21.85 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .105460214 - - - 84 - .97 - 4 - 4 - 84 - Spectra #200 [Round 1.5 mm, 1/16 in] - 2 - 6.95 - - - - Rocketman - LS-08 - Light Std Parabolic Parachute [Cd .97 (4.878 oz) 28.63 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .138288959 - - - 96 - .97 - 4 - 4 - 96 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3 - 4.05 - - - - Rocketman - LS-09 - Light Std Parabolic Parachute [Cd .97 (5.75 oz) 33.77 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .163000974 - - - 108 - .97 - 4 - 4 - 108 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3 - 4.78 - - - - Rocketman - LS-10 - Light Std Parabolic Parachute [Cd .97 (6.57 oz) 38.57 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .186256346 - - - 120 - .97 - 4 - 4 - 120 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3 - 5.46 - - - - Rocketman - LS-12 - Light Std Parabolic Parachute [Cd .97 (8.37 oz) 49.14 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .237285482 - - - 144 - .97 - 4 - 4 - 144 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3 - 6.95 - - - - Rocketman - LS-14 - Light Std Parabolic Parachute [Cd .97 (10.82 oz) 63.53 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .306741806 - - - 168 - .97 - 4 - 4 - 168 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3 - 8.99 - - - - Rocketman - LS-16 - Light Std Parabolic Parachute [Cd .97 (12.71 oz) 75.54 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .360322399 - - - 192 - .97 - 4 - 4 - 192 - Spectra #200 [Round 1.5 mm, 1/16 in] - 3 - 10.69 - - - - Rocketman - LS-18 - Light Std Parabolic Parachute [Cd .97 (14.58 oz) 85.59 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .413336002 - - - 216 - .97 - 4 - 4 - 216 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4 - 6.81 - - - - Rocketman - LS-19 - Light Std Parabolic Parachute [Cd .97 (20.885 oz) 122.59 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .592079725 - - - 228 - .97 - 4 - 4 - 228 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4 - 9.76 - - - - Rocketman - LS-20 - Light Std Parabolic Parachute [Cd .97 (21.858 oz) 128.30 in^3] - Ripstop nylon, ultra lightweight, 2 mil - .619663808 - - - 240 - .97 - 4 - 4 - 240 - Spectra #200 [Round 1.5 mm, 1/16 in] - 4 - 10.21 - - - - - - - From 8018e3f3f9a093d1d4dcf7b1b7d8e58504690e22 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Tue, 26 Apr 2022 09:08:36 +0200 Subject: [PATCH 07/14] Clean up Parachute --- .../openrocket/rocketcomponent/Parachute.java | 75 ++++++++----------- 1 file changed, 32 insertions(+), 43 deletions(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java index f8b440de2..74ffc5f08 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java @@ -161,15 +161,15 @@ public class Parachute extends RecoveryDevice { protected void loadFromPreset(ComponentPreset preset) { // BEGIN Substitute parachute description for component name - if (preset.has(ComponentPreset.DESCRIPTION)) { // If the preset has a Description field + if (preset.has(ComponentPreset.DESCRIPTION)) { String temporaryName = preset.get(ComponentPreset.DESCRIPTION); int size = temporaryName.length(); - if (size > 0) { // If the preset description => 1 character + if (size > 0) { this.name = preset.get(ComponentPreset.DESCRIPTION); - } else { // If the preset description = 0 characters + } else { this.name = getComponentName(); } - } else { // Fail safe - no preset description field + } else { this.name = getComponentName(); } // END Substitute parachute description for component name @@ -179,16 +179,16 @@ public class Parachute extends RecoveryDevice { } // BEGIN Implement parachute cd - if (preset.has(ComponentPreset.PARACHUTE_CD)) { // If the preset has a DragCoefficient field - if (preset.get(ComponentPreset.PARACHUTE_CD) > 0) { // If the preset DragCoefficient > 0 + if (preset.has(ComponentPreset.PARACHUTE_CD)) { + if (preset.get(ComponentPreset.PARACHUTE_CD) > 0) { cdAutomatic = false; cd = preset.get(ComponentPreset.PARACHUTE_CD); } - else { // If the preset DragCoefficient <= 0 + else { cdAutomatic = true; cd = Parachute.DEFAULT_CD; } - } else { // Fail-safe - no preset DragCoefficient field + } else { cdAutomatic = true; cd = Parachute.DEFAULT_CD; } @@ -196,79 +196,68 @@ public class Parachute extends RecoveryDevice { // BEGIN Implement parachute length, diameter, and volume //// BEGIN Implement parachute packed length - if (preset.has(ComponentPreset.PACKED_LENGTH)) { // If the preset has a PackedLength field + if (preset.has(ComponentPreset.PACKED_LENGTH)) { this.PackedLength = preset.get(ComponentPreset.PACKED_LENGTH); - if (PackedLength > 0) { // If the preset PackedLength length > 0 + if (PackedLength > 0) { length = PackedLength; } - if (PackedLength <= 0) { // If the preset PackedLength length <= 0 + if (PackedLength <= 0) { length = InitialPackedLength; } - } else { // fail-safe - no preset PackedLength field + } else { length = InitialPackedLength; } //// END Implement parachute packed length //// BEGIN Implement parachute packed diameter - if (preset.has(ComponentPreset.PACKED_DIAMETER)) { // If the preset has a PackedDiameter field + if (preset.has(ComponentPreset.PACKED_DIAMETER)) { this.PackedDiameter = preset.get(ComponentPreset.PACKED_DIAMETER); - if (PackedDiameter > 0) { // If the preset PackedDiameter length > 0 + if (PackedDiameter > 0) { radius = PackedDiameter / 2; } - if (PackedDiameter <= 0) { // If the preset PackedDiameter length <= 0 + if (PackedDiameter <= 0) { radius = InitialPackedRadius; } - } else { // Fail safe - no preset PackedDiameter field + } else { radius = InitialPackedRadius; } //// END Implement parachute packed diameter //// BEGIN Size parachute packed diameter within parent inner diameter - if (length > 0 && radius > 0) { // If preset parachute length & diameter - double innerRadius; + if (length > 0 && radius > 0) { double parachuteVolume; double trimPackedRadius = .975; parachuteVolume = (Math.PI * Math.pow(radius, 2) * length); - if (parent instanceof BodyComponent) { // If parent is a body tube - innerRadius = ((BodyComponent) parent).getInnerRadius(); - radius = innerRadius * trimPackedRadius; + if (parent instanceof NoseCone) { + radius = ((NoseCone) parent).getAftRadius(); length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); - } - if (parent instanceof InnerTube) { // If parent is an inner tube - innerRadius = ((InnerTube) parent).getInnerRadius(); - radius = innerRadius * trimPackedRadius; - length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); - } - if (parent instanceof TubeCoupler) { // If parent is a tube coupler - innerRadius = ((TubeCoupler) parent).getInnerRadius(); - radius = innerRadius * trimPackedRadius; - length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); - } - if (parent instanceof NoseCone) { // If parent is nose cone - innerRadius = ((NoseCone) parent).getAftRadius(); - radius = innerRadius * Math.pow((trimPackedRadius), 2); - length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); - } - if (parent instanceof Transition) { // If parent is nose cone|transition + } else if (parent instanceof Transition) { double foreRadius = ((Transition) parent).getForeRadius(); double aftRadius = ((Transition) parent).getAftRadius(); - innerRadius = (Math.max(foreRadius, aftRadius)); + double innerRadius = (Math.max(foreRadius, aftRadius)); radius = innerRadius * Math.pow((trimPackedRadius), 2); length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); + } else if (parent instanceof BodyComponent) { + radius = ((BodyComponent) parent).getInnerRadius(); + length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); + } else if (parent instanceof RingComponent) { + radius = ((RingComponent) parent).getInnerRadius(); + length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); } + } //// END Size parachute packed diameter within parent inner diameter // END Implement parachute length, diameter, and volume // BEGIN Activate Override Mass Preset - if (preset.has(ComponentPreset.MASS)) { // If the preset has a mass field + if (preset.has(ComponentPreset.MASS)) { this.overrideMass = (preset.get(ComponentPreset.MASS)); - if (overrideMass > 0) { // If the preset mass value > 0 + if (overrideMass > 0) { massOverridden = true; - } else { // If the preset mass value <= 0 + } else { this.overrideMass = 0; massOverridden = false; } - } else { // Fail safe - no mass value field + } else { this.overrideMass = 0; massOverridden = false; } From 3166dee81ce74b15df96da7cdd04bfba0360e620 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 27 Apr 2022 21:22:27 +0200 Subject: [PATCH 08/14] Implement auto packed diameter for parachute Adds an Auto checkbox in the parachute configuration dialog that automatically sets the parachute's packed diameter equal to the inner diameter of its parent --- .../rocketcomponent/MassObject.java | 4 +- .../openrocket/rocketcomponent/Parachute.java | 82 ++++++++++++++----- .../gui/configdialog/ParachuteConfig.java | 11 ++- 3 files changed, 73 insertions(+), 24 deletions(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/MassObject.java b/core/src/net/sf/openrocket/rocketcomponent/MassObject.java index 80ac7c2b6..58adc3f39 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/MassObject.java +++ b/core/src/net/sf/openrocket/rocketcomponent/MassObject.java @@ -66,12 +66,12 @@ public abstract class MassObject extends InternalComponent { } - public final double getRadius() { + public double getRadius() { return radius; } - public final void setRadius(double radius) { + public void setRadius(double radius) { radius = Math.max(radius, 0); for (RocketComponent listener : configListeners) { diff --git a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java index 74ffc5f08..e7b2a12c7 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java @@ -15,6 +15,7 @@ public class Parachute extends RecoveryDevice { private double diameter; private final double InitialPackedLength = this.length; private final double InitialPackedRadius = this.radius; + private boolean autoRadius; private Material lineMaterial; private int lineCount = 6; @@ -145,6 +146,64 @@ public class Parachute extends RecoveryDevice { //// Parachute return trans.get("Parachute.Parachute"); } + + @Override + public void setRadius(double radius) { + radius = Math.max(radius, 0); + + for (RocketComponent listener : configListeners) { + if (listener instanceof MassObject) { + ((MassObject) listener).setRadius(radius); + } + } + + if (MathUtil.equals(this.radius, radius) && (!autoRadius)) + return; + + this.autoRadius = false; + this.radius = radius; + fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE); + } + + @Override + public double getRadius() { + if (autoRadius) { + if (parent == null) { + return radius; + } + if (parent instanceof NoseCone) { + return ((NoseCone) parent).getAftRadius(); + } else if (parent instanceof Transition) { + double foreRadius = ((Transition) parent).getForeRadius(); + double aftRadius = ((Transition) parent).getAftRadius(); + return (Math.max(foreRadius, aftRadius)); + } else if (parent instanceof BodyComponent) { + return ((BodyComponent) parent).getInnerRadius(); + } else if (parent instanceof RingComponent) { + return ((RingComponent) parent).getInnerRadius(); + } + } + return radius; + } + + public boolean isRadiusAutomatic() { + return autoRadius; + } + + public void setRadiusAutomatic(boolean auto) { + for (RocketComponent listener : configListeners) { + if (listener instanceof Parachute) { + ((Parachute) listener).setRadiusAutomatic(auto); + } + } + + if (autoRadius == auto) + return; + + autoRadius = auto; + + fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); + } @Override public boolean allowsChildren() { @@ -223,26 +282,9 @@ public class Parachute extends RecoveryDevice { //// END Implement parachute packed diameter //// BEGIN Size parachute packed diameter within parent inner diameter if (length > 0 && radius > 0) { - double parachuteVolume; - double trimPackedRadius = .975; - parachuteVolume = (Math.PI * Math.pow(radius, 2) * length); - - if (parent instanceof NoseCone) { - radius = ((NoseCone) parent).getAftRadius(); - length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); - } else if (parent instanceof Transition) { - double foreRadius = ((Transition) parent).getForeRadius(); - double aftRadius = ((Transition) parent).getAftRadius(); - double innerRadius = (Math.max(foreRadius, aftRadius)); - radius = innerRadius * Math.pow((trimPackedRadius), 2); - length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); - } else if (parent instanceof BodyComponent) { - radius = ((BodyComponent) parent).getInnerRadius(); - length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); - } else if (parent instanceof RingComponent) { - radius = ((RingComponent) parent).getInnerRadius(); - length = parachuteVolume / (Math.PI * Math.pow((radius), 2)); - } + double parachuteVolume = (Math.PI * Math.pow(radius, 2) * length); + setRadiusAutomatic(true); + length = parachuteVolume / (Math.PI * Math.pow(getRadius(), 2)); } //// END Size parachute packed diameter within parent inner diameter diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java index fac72e6fa..dcbcf9ad2 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/ParachuteConfig.java @@ -6,6 +6,7 @@ import java.awt.event.ActionListener; import javax.swing.ComboBoxModel; import javax.swing.JButton; +import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; @@ -30,6 +31,7 @@ import net.sf.openrocket.rocketcomponent.DeploymentConfiguration; import net.sf.openrocket.rocketcomponent.DeploymentConfiguration.DeployEvent; import net.sf.openrocket.rocketcomponent.Parachute; import net.sf.openrocket.rocketcomponent.RocketComponent; +import net.sf.openrocket.rocketcomponent.Transition; import net.sf.openrocket.rocketcomponent.position.AxialMethod; import net.sf.openrocket.startup.Application; import net.sf.openrocket.unit.UnitGroup; @@ -177,7 +179,7 @@ public class ParachuteConfig extends RecoveryDeviceConfig { //// Packed diameter: panel.add(new JLabel(trans.get("ParachuteCfg.lbl.Packeddiam"))); - DoubleModel od = new DoubleModel(component, "Radius", 2, UnitGroup.UNITS_LENGTH, 0); + final DoubleModel od = new DoubleModel(component, "Radius", 2, UnitGroup.UNITS_LENGTH, 0); // Diameter = 2*Radius spin = new JSpinner(od.getSpinnerModel()); @@ -185,7 +187,12 @@ public class ParachuteConfig extends RecoveryDeviceConfig { panel.add(spin, "growx"); panel.add(new UnitSelector(od), "growx"); - panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap 30lp"); + panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap"); + + ////// Automatic + JCheckBox checkAutoPackedRadius = new JCheckBox(od.getAutomaticAction()); + checkAutoPackedRadius.setText(trans.get("TransitionCfg.checkbox.Automatic")); + panel.add(checkAutoPackedRadius, "skip, span 2, wrap 30lp"); //// Deployment From c6788c95944ca632f901f183abde0889c3c78063 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 27 Apr 2022 21:36:35 +0200 Subject: [PATCH 09/14] Implement auto radius for all mass objects --- .../rocketcomponent/MassObject.java | 43 ++++++++++++-- .../openrocket/rocketcomponent/Parachute.java | 59 ------------------- .../gui/configdialog/MassComponentConfig.java | 8 ++- .../gui/configdialog/ShockCordConfig.java | 5 +- .../gui/configdialog/StreamerConfig.java | 9 ++- 5 files changed, 57 insertions(+), 67 deletions(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/MassObject.java b/core/src/net/sf/openrocket/rocketcomponent/MassObject.java index 58adc3f39..69ecdc658 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/MassObject.java +++ b/core/src/net/sf/openrocket/rocketcomponent/MassObject.java @@ -22,6 +22,7 @@ import net.sf.openrocket.util.MathUtil; public abstract class MassObject extends InternalComponent { protected double radius; + private boolean autoRadius = false; private double radialPosition; private double radialDirection; @@ -67,6 +68,22 @@ public abstract class MassObject extends InternalComponent { public double getRadius() { + if (autoRadius) { + if (parent == null) { + return radius; + } + if (parent instanceof NoseCone) { + return ((NoseCone) parent).getAftRadius(); + } else if (parent instanceof Transition) { + double foreRadius = ((Transition) parent).getForeRadius(); + double aftRadius = ((Transition) parent).getAftRadius(); + return (Math.max(foreRadius, aftRadius)); + } else if (parent instanceof BodyComponent) { + return ((BodyComponent) parent).getInnerRadius(); + } else if (parent instanceof RingComponent) { + return ((RingComponent) parent).getInnerRadius(); + } + } return radius; } @@ -80,14 +97,32 @@ public abstract class MassObject extends InternalComponent { } } - if (MathUtil.equals(this.radius, radius)) { + if (MathUtil.equals(this.radius, radius) && (!autoRadius)) return; - } + + this.autoRadius = false; this.radius = radius; fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE); } - - + + public boolean isRadiusAutomatic() { + return autoRadius; + } + + public void setRadiusAutomatic(boolean auto) { + for (RocketComponent listener : configListeners) { + if (listener instanceof Parachute) { + ((Parachute) listener).setRadiusAutomatic(auto); + } + } + + if (autoRadius == auto) + return; + + autoRadius = auto; + + fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); + } public final double getRadialPosition() { return radialPosition; diff --git a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java index e7b2a12c7..75a634266 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Parachute.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Parachute.java @@ -15,7 +15,6 @@ public class Parachute extends RecoveryDevice { private double diameter; private final double InitialPackedLength = this.length; private final double InitialPackedRadius = this.radius; - private boolean autoRadius; private Material lineMaterial; private int lineCount = 6; @@ -146,64 +145,6 @@ public class Parachute extends RecoveryDevice { //// Parachute return trans.get("Parachute.Parachute"); } - - @Override - public void setRadius(double radius) { - radius = Math.max(radius, 0); - - for (RocketComponent listener : configListeners) { - if (listener instanceof MassObject) { - ((MassObject) listener).setRadius(radius); - } - } - - if (MathUtil.equals(this.radius, radius) && (!autoRadius)) - return; - - this.autoRadius = false; - this.radius = radius; - fireComponentChangeEvent(ComponentChangeEvent.MASS_CHANGE); - } - - @Override - public double getRadius() { - if (autoRadius) { - if (parent == null) { - return radius; - } - if (parent instanceof NoseCone) { - return ((NoseCone) parent).getAftRadius(); - } else if (parent instanceof Transition) { - double foreRadius = ((Transition) parent).getForeRadius(); - double aftRadius = ((Transition) parent).getAftRadius(); - return (Math.max(foreRadius, aftRadius)); - } else if (parent instanceof BodyComponent) { - return ((BodyComponent) parent).getInnerRadius(); - } else if (parent instanceof RingComponent) { - return ((RingComponent) parent).getInnerRadius(); - } - } - return radius; - } - - public boolean isRadiusAutomatic() { - return autoRadius; - } - - public void setRadiusAutomatic(boolean auto) { - for (RocketComponent listener : configListeners) { - if (listener instanceof Parachute) { - ((Parachute) listener).setRadiusAutomatic(auto); - } - } - - if (autoRadius == auto) - return; - - autoRadius = auto; - - fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); - } @Override public boolean allowsChildren() { diff --git a/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java index 4f510fc0f..d7177e998 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/MassComponentConfig.java @@ -4,6 +4,7 @@ import java.awt.event.ActionEvent; import java.awt.event.ActionListener; import javax.swing.JButton; +import javax.swing.JCheckBox; import javax.swing.JComboBox; import javax.swing.JLabel; import javax.swing.JPanel; @@ -105,7 +106,12 @@ public class MassComponentConfig extends RocketComponentConfig { panel.add(new UnitSelector(od), "growx"); panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap"); - + + ////// Automatic + JCheckBox checkAutoPackedRadius = new JCheckBox(od.getAutomaticAction()); + checkAutoPackedRadius.setText(trans.get("TransitionCfg.checkbox.Automatic")); + panel.add(checkAutoPackedRadius, "skip, span 2, wrap 30lp"); + //// Position //// Position relative to: diff --git a/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java index 745ddb649..4403f0049 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/ShockCordConfig.java @@ -112,8 +112,11 @@ public class ShockCordConfig extends RocketComponentConfig { panel2.add(new UnitSelector(od), "growx"); panel2.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap"); - + ////// Automatic + JCheckBox checkAutoPackedRadius = new JCheckBox(od.getAutomaticAction()); + checkAutoPackedRadius.setText(trans.get("TransitionCfg.checkbox.Automatic")); + panel2.add(checkAutoPackedRadius, "skip, span 2, wrap"); //// General and General properties tabbedPane.insertTab(trans.get("ShockCordCfg.tab.General"), null, panel, diff --git a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java index c16ea1638..e05b2ad94 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java @@ -185,8 +185,13 @@ public class StreamerConfig extends RecoveryDeviceConfig { panel.add(spin, "growx"); panel.add(new UnitSelector(od), "growx"); - panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap 30lp"); - + panel.add(new BasicSlider(od.getSliderModel(0, 0.04, 0.2)), "w 100lp, wrap"); + + ////// Automatic + JCheckBox checkAutoPackedRadius = new JCheckBox(od.getAutomaticAction()); + checkAutoPackedRadius.setText(trans.get("TransitionCfg.checkbox.Automatic")); + panel.add(checkAutoPackedRadius, "skip, span 2, wrap 30lp"); + //// Deployment //// Deploys at: From 477096975dd2f82b8e84aedfde57818cd9d4e835 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Wed, 27 Apr 2022 21:42:56 +0200 Subject: [PATCH 10/14] Include mass object auto radius in OR save/import --- .../openrocket/file/openrocket/importt/DocumentConfig.java | 4 +++- .../openrocket/file/openrocket/savers/MassObjectSaver.java | 6 +++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/DocumentConfig.java b/core/src/net/sf/openrocket/file/openrocket/importt/DocumentConfig.java index 138456aa8..16f733ec9 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/DocumentConfig.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/DocumentConfig.java @@ -369,7 +369,9 @@ class DocumentConfig { setters.put("MassObject:packedlength", new DoubleSetter( Reflection.findMethod(MassObject.class, "setLength", double.class))); setters.put("MassObject:packedradius", new DoubleSetter( - Reflection.findMethod(MassObject.class, "setRadius", double.class))); + Reflection.findMethod(MassObject.class, "setRadius", double.class), + "auto", " ", + Reflection.findMethod(MassObject.class, "setRadiusAutomatic", boolean.class))); setters.put("MassObject:radialposition", new DoubleSetter( Reflection.findMethod(MassObject.class, "setRadialPosition", double.class))); setters.put("MassObject:radialdirection", new DoubleSetter( diff --git a/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java index 298cb2636..3cbf57605 100644 --- a/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java @@ -14,7 +14,11 @@ public class MassObjectSaver extends InternalComponentSaver { MassObject mass = (MassObject) c; elements.add("" + mass.getLength() + ""); - elements.add("" + mass.getRadius() + ""); + if (mass.isRadiusAutomatic()) { + elements.add("auto " + mass.getRadius() + ""); + } else { + elements.add("" + mass.getRadius() + ""); + } elements.add("" + mass.getRadialPosition() + ""); elements.add("" + (mass.getRadialDirection() * 180.0 / Math.PI) + ""); From f5eaed1b5101908f852aef9193026e9070e8f92e Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 28 Apr 2022 00:06:21 +0200 Subject: [PATCH 11/14] Implement mass object auto radius in OR save/import --- .../openrocket/file/openrocket/savers/MassObjectSaver.java | 4 ++-- core/src/net/sf/openrocket/rocketcomponent/MassObject.java | 5 ++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java b/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java index 3cbf57605..cefbb9345 100644 --- a/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/savers/MassObjectSaver.java @@ -15,9 +15,9 @@ public class MassObjectSaver extends InternalComponentSaver { elements.add("" + mass.getLength() + ""); if (mass.isRadiusAutomatic()) { - elements.add("auto " + mass.getRadius() + ""); + elements.add("auto " + mass.getRadiusNoAuto() + ""); } else { - elements.add("" + mass.getRadius() + ""); + elements.add("" + mass.getRadiusNoAuto() + ""); } elements.add("" + mass.getRadialPosition() + ""); elements.add("" + (mass.getRadialDirection() * 180.0 / Math.PI) diff --git a/core/src/net/sf/openrocket/rocketcomponent/MassObject.java b/core/src/net/sf/openrocket/rocketcomponent/MassObject.java index 69ecdc658..4c2c30b0a 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/MassObject.java +++ b/core/src/net/sf/openrocket/rocketcomponent/MassObject.java @@ -86,7 +86,10 @@ public abstract class MassObject extends InternalComponent { } return radius; } - + + public double getRadiusNoAuto() { + return radius; + } public void setRadius(double radius) { radius = Math.max(radius, 0); From fbcefeb46fb8cde2b184326f7120e9668ab5f241 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 28 Apr 2022 00:11:17 +0200 Subject: [PATCH 12/14] Fix StreamerConfig comment --- .../src/net/sf/openrocket/gui/configdialog/StreamerConfig.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java index e05b2ad94..c1ed1501e 100644 --- a/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java +++ b/swing/src/net/sf/openrocket/gui/configdialog/StreamerConfig.java @@ -160,7 +160,7 @@ public class StreamerConfig extends RecoveryDeviceConfig { "w 100lp, wrap"); - //// Spatial length: + //// Packed length: panel.add(new JLabel(trans.get("StreamerCfg.lbl.Packedlength"))); m = new DoubleModel(component, "Length", UnitGroup.UNITS_LENGTH, 0); From a512aa4981c3930427d97a8c79a6a4a5a1c17c4e Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 28 Apr 2022 00:19:13 +0200 Subject: [PATCH 13/14] Fix StreamerConfig import issue --- core/src/net/sf/openrocket/rocketcomponent/Streamer.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/Streamer.java b/core/src/net/sf/openrocket/rocketcomponent/Streamer.java index caa7e990e..c7498a1be 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/Streamer.java +++ b/core/src/net/sf/openrocket/rocketcomponent/Streamer.java @@ -58,7 +58,7 @@ public class Streamer extends RecoveryDevice { if (MathUtil.equals(this.stripWidth, stripWidth)) return; this.stripWidth = stripWidth; - this.length = stripWidth; + clearPreset(); fireComponentChangeEvent(ComponentChangeEvent.BOTH_CHANGE); } From 14bd046a67c8464e3ab4e1086192661f55088412 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Thu, 28 Apr 2022 00:26:46 +0200 Subject: [PATCH 14/14] Fix merge conflict? --- .../Front_Range_Rocket_Recovery.orc.txt | 574 ++++++++++++++++++ 1 file changed, 574 insertions(+) create mode 100644 swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery.orc.txt diff --git a/swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery.orc.txt b/swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery.orc.txt new file mode 100644 index 000000000..85d73bbf0 --- /dev/null +++ b/swing/resources-src/datafiles/legacy_components/Front_Range_Rocket_Recovery.orc.txt @@ -0,0 +1,574 @@ + + + + + + + + 0.1 + + + + + + + Ripstop nylon, lightweight, 3 mil + 0.035653924 + SURFACE + + + + + + Nylon #200 IIa Paraline [flat 4.0 mm, 5/32 in] + 0.002952756 + LINE + + + + Nylon #400 IIIa Paraline [flat 6.4 mm, 1/4 in] + 0.003718285 + LINE + + + + Spectra #200 [Round 1.5 mm, 1/16 in] + 0.000656168 + LINE + + + + Spectra #400 [Oval 2.55 mm, 3/32in] + 0.001202975 + LINE + + + + + + + + + + Front Range Rocket Recovery + FR3-12-12 + Elliptical 12-Gore Parachute [Cd 1.5 (.35oz) 4.1 in^3]] + Ripstop nylon, lightweight, 3 mil + .35 + + + 12 + 1.5 + 12 + 12 + 18 + Spectra #200 [Round 1.5 mm, 1/16 in] + 1.4 + 2.8 + + + + Front Range Rocket Recovery + FR3-12-15 + Elliptical 12-Gore Parachute [Cd 1.5 (.49 oz) 4.4 in^3] + Ripstop nylon, lightweight, 3 mil + .49 + + + 15 + 1.5 + 12 + 12 + 22.5 + Spectra #200 [Round 1.5 mm, 1/16 in] + 1.4 + 3.0 + + + + Front Range Rocket Recovery + FR3-12-18 + Elliptical 12-Gore Parachute [Cd 1.5 (.71 oz) 6.1 in^3] + Ripstop nylon, lightweight, 3 mil + .71 + + + 18 + 1.5 + 12 + 12 + 27 + Spectra #200 [Round 1.5 mm, 1/16 in] + 1.6 + 3.0 + + + + Front Range Rocket Recovery + FR3-12-24 + Elliptical 12-Gore Parachute [Cd 1.5 (1.13 oz) 7.7 in^3] + Ripstop nylon, lightweight, 3 mil + 1.13 + + + 24 + 1.5 + 12 + 12 + 36 + Spectra #200 [Round 1.5 mm, 1/16 in] + 1.6 + 3.9 + + + + Front Range Rocket Recovery + FR3-12-30 + Elliptical 12-Gore Parachute [Cd 1.5 (1.48 oz) 9.7 in^3] + Ripstop nylon, lightweight, 3 mil + 1.48 + + + 30 + 1.5 + 12 + 12 + 45 + Spectra #200 [Round 1.5 mm, 1/16 in] + 1.6 + 4.8 + + + + Front Range Rocket Recovery + FR3-12-36 + Elliptical 12-Gore Parachute [Cd 1.5 (1.9 oz) 10.7 in^3] + Ripstop nylon, lightweight, 3 mil + 1.9 + + + 36 + 1.5 + 12 + 12 + 54 + Spectra #200 [Round 1.5 mm, 1/16 in] + 1.6 + 5.5 + + + + Front Range Rocket Recovery + FR3-12-42 + Elliptical 12-Gore Parachute [Cd 1.5 (2.65 oz) 4.4 in^3] + Ripstop nylon, lightweight, 3 mil + 2.65 + + + 42 + 1.5 + 12 + 12 + 63 + Spectra #200 [Round 1.5 mm, 1/16 in] + 1.9 + 5.7 + + + + Front Range Rocket Recovery + FR3-12-48 + Elliptical 12-Gore Parachute [Cd 1.5 (3.25 oz) 18.8 in^3] + Ripstop nylon, lightweight, 3 mil + 3.25 + + + 48 + 1.5 + 12 + 12 + 72 + Spectra #200 [Round 1.5 mm, 1/16 in] + 2.2 + 5.1 + + + + Front Range Rocket Recovery + FR3-12-60 + Elliptical 12-Gore Parachute [Cd 1.5 (4.59 oz) 26.9 in^3] + Ripstop nylon, lightweight, 3 mil + 4.59 + + + 48 + 1.5 + 12 + 12 + 90 + Spectra #200 [Round 1.5 mm, 1/16 in] + 2.4 + 6.1 + + + + Front Range Rocket Recovery + FR3-16-36 + Elliptical 16-Gore Parachute [Cd 1.5 (2.12 oz) 10.7 in^3] + Ripstop nylon, lightweight, 3 mil + 2.12 + + + 36 + 1.5 + 16 + 16 + 54 + Spectra #200 [Round 1.5 mm, 1/16 in] + 1.6 + 5.5 + + + + Front Range Rocket Recovery + FR3-16-42 + Elliptical 16-Gore Parachute [Cd 1.5 (2.65 oz) 15.9 in^3] + Ripstop nylon, lightweight, 3 mil + 2.65 + + + 42 + 1.5 + 16 + 16 + 63 + Spectra #200 [Round 1.5 mm, 1/16 in] + 1.9 + 5.7 + + + + Front Range Rocket Recovery + FR3-16-48 + Elliptical 16-Gore Parachute [Cd 1.5 (3.39 oz) 18.8 in^3] + Ripstop nylon, lightweight, 3 mil + 3.39 + + + 48 + 1.5 + 16 + 16 + 72 + Spectra #200 [Round 1.5 mm, 1/16 in] + 2.2 + 5.1 + + + + Front Range Rocket Recovery + FR3-16-60 + Elliptical 16-Gore Parachute [Cd 1.5 (4.59 oz) 26.9 in^3] + Ripstop nylon, lightweight, 3 mil + 4.59 + + + 60 + 1.5 + 16 + 16 + 90 + Spectra #200 [Round 1.5 mm, 1/16 in] + 2.4 + 6.1 + + + + Front Range Rocket Recovery + FR3-16-72 + Elliptical 16-Gore Parachute [Cd 1.5 (6.63 oz) 34.4 in^3] + Ripstop nylon, lightweight, 3 mil + 6.63 + + + 72 + 1.5 + 16 + 16 + 108 + Spectra #200 [Round 1.5 mm, 1/16 in] + 2.6 + 6.7 + + + + Front Range Rocket Recovery + FR3-16-84 + Elliptical 16-Gore Parachute [Cd 1.5 (8.29 oz) 42.5 in^3] + Ripstop nylon, lightweight, 3 mil + 8.29 + + + 84 + 1.5 + 16 + 16 + 126 + Spectra #200 [Round 1.5 mm, 1/16 in] + 2.8 + 7.1 + + + + Front Range Rocket Recovery + FR3-16-96 + Elliptical 16-Gore Parachute [Cd 1.5 (11.15 oz) 61.3 in^3] + Ripstop nylon, lightweight, 3 mil + 11.15 + + + 96 + 1.5 + 16 + 16 + 144 + Spectra #200 [Round 1.5 mm, 1/16 in] + 3.1 + 7.9 + + + + +