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

Merge pull request #2248 from JoePfeiffer/fix-2247

Browse Source 
Use MassObject API to set parachute length, radius from preset
This commit is contained in:
Joe Pfeiffer 2023-07-17 18:25:42 -06:00 committed by GitHub
commit 4e982f7cd7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -211,14 +211,15 @@ public class Parachute extends RecoveryDevice {
// // Set preset parachute packed length // // Set preset parachute packed length
if ((preset.has(ComponentPreset.PACKED_LENGTH)) && preset.get(ComponentPreset.PACKED_LENGTH) > 0) { if ((preset.has(ComponentPreset.PACKED_LENGTH)) && preset.get(ComponentPreset.PACKED_LENGTH) > 0) {
length = preset.get(ComponentPreset.PACKED_LENGTH); setLength(preset.get(ComponentPreset.PACKED_LENGTH));
} }
// // Set preset parachute packed diameter // // Set preset parachute packed diameter
if ((preset.has(ComponentPreset.PACKED_DIAMETER)) && preset.get(ComponentPreset.PACKED_DIAMETER) > 0) { if ((preset.has(ComponentPreset.PACKED_DIAMETER)) && preset.get(ComponentPreset.PACKED_DIAMETER) > 0) {
radius = preset.get(ComponentPreset.PACKED_DIAMETER) / 2; setRadius(preset.get(ComponentPreset.PACKED_DIAMETER) / 2);
} }
// // Size parachute packed diameter within parent inner diameter // // Size parachute packed diameter within parent inner diameter
if (length > 0 && radius > 0) { if (preset.has(ComponentPreset.PACKED_LENGTH) && (getLength() > 0) &&
preset.has(ComponentPreset.PACKED_DIAMETER) && (getRadius() > 0)) {
setRadiusAutomatic(true); setRadiusAutomatic(true);
} }