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

Implement new recovery device position rules (hopefully final)

Browse Source
This commit is contained in:
SiboVG 2023-03-22 19:20:17 +01:00
parent c4794e5bd9
commit fadff986eb
1 changed files with 144 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

192
core/src/net/sf/openrocket/file/rasaero/importt/RecoveryHandler.java
View File

@ -188,14 +188,20 @@ public class RecoveryHandler extends AbstractElementHandler {
/** /**
* RASAero does not specify where recovery devices are located. * RASAero does not specify where recovery devices are located.
* We will use the following (arbitrary, but logical) rule to add the recovery device to the rocket: * We will use the following (arbitrary, but logical) rule to add the recovery device to the rocket:
* 1. If the sustainer consists of two body tubes then Recovery Device 2 (deployment as set altitude) is positioned * If only Recovery Device 1 (deployment at apogee) is active, but Recovery Device 2 (deployment at altitude) is not:
* near the top (about 1.125 calibers) of the upper body tube with Recovery Device 1 (deployment at apogee) * 1. If the sustainer has 1, 2 or 3 body tubes (with no vent band - a body tube with length ≤ .8 calibers),
* positioned near the top (about 1.125 calibers) of the second body tube down. * Recovery Device 1 (deployment at apogee) is positioned near the top (1.125 calibers) of the first body tube.
* 2. If the sustainer consists of three or more body tubes then Recovery Device 2 (deployment as set altitude) is * 2. If the sustainer has 3 body tubes and one vent band (a body tube with length ≤ .8 calibers),
* positioned near the top (about 1.125 calibers) of the upper body tube with Recovery Device 1 (deployment at apogee) * position Recovery Device 1 in the body tube above the vent band, near the top (1.125 calibers).
* positioned near the top (about 1.125 calibers) of the third body tube down. * 3. If the sustainer has 4 or more body tubes (including any vent bands), position Recovery Device 1 in the
* 3. In all other cases: put recovery device 1 in the first sustainer body tube just below the nosecone * second body tube, near the top (1.125 calibers).
* (about 1.125 calibers below the top of the body tube). * If there is a Recovery Device 2:
* 4. If the sustainer has 1 body tube, position Recovery Device 1 near the top (1.125 calibers) of the first body tube.
* 5. If the sustainer has 2 body tubes, position Recovery Device 1 near the top (1.125 calibers) of the second body tube.
* 6. If the sustainer has 3 body tubes, position Recovery Device 1 near the top (1.125 calibers) of the second body tube.
* 7. If the sustainer has 3 body tubes and one vent band (a body tube with length ≤ .8 calibers), position
* Recovery Device 1 near the top (1.125 calibers) of the tube below the vent band.
* 8. If the sustainer has 4 or more body tubes, position Recovery Device 1 near the top (1.125 calibers) of the third body tube.
* @param recoveryDevice the recovery device to add * @param recoveryDevice the recovery device to add
* @param warnings the warning set to add import warnings to * @param warnings the warning set to add import warnings to
*/ */
@ -207,36 +213,100 @@ public class RecoveryHandler extends AbstractElementHandler {
} }
final BodyTube parentBodyTube; final BodyTube parentBodyTube;
List<BodyTube> bodyTubes = getBodyTubesInStage(sustainer);
int nrOfTubes = bodyTubes.size();
// If there is a recovery device 2, then we will use special rules // If there is a Recovery Device 2
if (event[1] && !"None".equals(eventType[1])) { if (event[1] && !"None".equals(eventType[1])) {
List<BodyTube> bodyTubes = getBodyTubesInStage(sustainer); switch (nrOfTubes) {
int nrOfTubes = bodyTubes.size(); case 0:
warnings.add("No sustainer body tube found." + recoveryDevice.getName() + " will not be added to the rocket.");
return;
case 1:
case 2:
case 3:
// Rule 1: Add to the first tube, 1.125 calibers from the top
parentBodyTube = bodyTubes.get(0);
break;
case 4:
// Check if there is a vent band
BodyTube ventBand = null;
for (BodyTube tube : bodyTubes) {
if (tube.getLength() <= 1.6 * tube.getOuterRadius()) { // 0.8 calibers
ventBand = tube;
break;
}
}
// Rule 1: Two body tubes => add to second tube if (ventBand != null) {
if (nrOfTubes == 2) { // Rule 2: Add to the tube above the vent band, 1.125 calibers from the top
parentBodyTube = bodyTubes.get(1); int index = bodyTubes.indexOf(ventBand);
parentBodyTube.addChild(recoveryDevice); int parentIndex = Math.max(index - 1, 0);
} parentBodyTube = bodyTubes.get(parentIndex);
// Rule 2: Three or more body tubes => add to third tube } else {
else if (nrOfTubes >= 3) { // Rule 3: Add to the third tube, 1.125 calibers from the top
parentBodyTube = bodyTubes.get(2); parentBodyTube = bodyTubes.get(2);
parentBodyTube.addChild(recoveryDevice); }
}
// Rule 3: Less than two body tubes => add to first tube break;
else { default:
parentBodyTube = (BodyTube) sustainer.getChild(1); // Rule 3: Add to the third tube, 1.125 calibers from the top
parentBodyTube.addChild(recoveryDevice); parentBodyTube = bodyTubes.get(2);
break;
} }
} }
// Rule 3: Add to the first tube // No Recovery Device 2
else { else {
parentBodyTube = (BodyTube) sustainer.getChild(1); switch (nrOfTubes) {
parentBodyTube.addChild(recoveryDevice); case 0:
warnings.add("No sustainer body tube found." + recoveryDevice.getName() + " will not be added to the rocket.");
return;
case 1:
// Rule 4: Add to the first tube, 1.125 calibers from the top
parentBodyTube = bodyTubes.get(0);
break;
case 2:
// Rule 5: Add to the second tube, 1.125 calibers from the top
parentBodyTube = bodyTubes.get(1);
break;
case 3:
// Rule 6: Add to the second tube, 1.125 calibers from the top
parentBodyTube = bodyTubes.get(1);
break;
case 4:
// Check if there is a vent band
BodyTube ventBand = null;
for (BodyTube tube : bodyTubes) {
if (tube.getLength() <= 1.6 * tube.getOuterRadius()) { // 0.8 calibers
ventBand = tube;
break;
}
}
if (ventBand != null) {
// Rule 7: Add to the tube below the vent band, 1.125 calibers from the top
int index = bodyTubes.indexOf(ventBand);
int parentIndex = Math.min(index + 1, bodyTubes.size() - 1);
parentBodyTube = bodyTubes.get(parentIndex);
} else {
// Rule 8: Add to the third tube, 1.125 calibers from the top
parentBodyTube = bodyTubes.get(2);
}
break;
default:
// Rule 8: Add to the third tube, 1.125 calibers from the top
parentBodyTube = bodyTubes.get(2);
break;
}
} }
// Add the recovery device to the rocket
parentBodyTube.addChild(recoveryDevice);
// Position the recovery device
recoveryDevice.setAxialMethod(AxialMethod.TOP); recoveryDevice.setAxialMethod(AxialMethod.TOP);
double offset = parentBodyTube.getOuterRadius() * 1.125; double offset = parentBodyTube.getOuterRadius() * 2.25; // 1.125 calibers
if (offset + recoveryDevice.getLength() > parentBodyTube.getLength()) { if (offset + recoveryDevice.getLength() > parentBodyTube.getLength()) {
offset = 0; offset = 0;
} }
@ -245,20 +315,19 @@ public class RecoveryHandler extends AbstractElementHandler {
/** /**
* RASAero does not specify where recovery devices are located. * RASAero does not specify where recovery devices are located.
* We will use the following (arbitrary, but logical) rules to add the recovery device to the rocket: * We will use the following (arbitrary, but logical) rules to add Recovery Device 2 (deployment at altitude <->
* 1. If the airframe has only 1 body tube: * Recovery Device 1, with deployment at apogee) to the rocket:
* put recovery device 2 in the first body tube just below recovery device 1. * 1. If the sustainer has 1 body tube, position Recovery Device 2 in the first body tube, just below Recovery Device 1.
* 2. If the airframe has two body tubes: * 2. If the sustainer has 2 or 3 body tubes, position Recovery Device 2 near the top (1.125 calibers) of the first body tube.
* put recovery device 2 in the first body tube (about 1.125 calibers below the top of the first body tube). * 3. If the sustainer has 3 body tubes and one vent band (a body tube with length ≤ .8 calibers), position
* 3. If the airframe has three or more body tubes: * Recovery Device 2 near the top (1.125 calibers) of the tube above the vent band.
* put recovery device 2 in the first body tube (about 1.125 calibers below the top of the first body tube). * 4. If the sustainer has 4 or more body tubes, position Recovery Device 1 near the top (1.125 calibers) of the second body tube.
* @param recoveryDevice the recovery device to add * @param recoveryDevice the recovery device to add
* @param warnings the warning set to add import warnings to * @param warnings the warning set to add import warnings to
*/ */
private void addRecoveryDevice2ToRocket(RecoveryDevice recoveryDevice, WarningSet warnings) { private void addRecoveryDevice2ToRocket(RecoveryDevice recoveryDevice, WarningSet warnings) {
final BodyTube bodyTube; double offset = 0;
double offset; final BodyTube parentBodyTube;
AxialStage sustainer = rocket.getStage(0); AxialStage sustainer = rocket.getStage(0);
List<BodyTube> bodyTubes = getBodyTubesInStage(sustainer); List<BodyTube> bodyTubes = getBodyTubesInStage(sustainer);
@ -267,22 +336,49 @@ public class RecoveryHandler extends AbstractElementHandler {
warnings.add("No sustainer body tube found." + recoveryDevice.getName() + " will not be added to the rocket."); warnings.add("No sustainer body tube found." + recoveryDevice.getName() + " will not be added to the rocket.");
return; return;
case 1: case 1:
// Rule 1: If there is only one body tube, add the recovery device to the first body tube, after recovery device 1 // Rule 1: Add to the first tube, just below Recovery Device 1
bodyTube = bodyTubes.get(0); parentBodyTube = bodyTubes.get(0);
offset = bodyTube.getOuterRadius() * 1.125; offset += recoveryDevice.getLength() * 1.05; // = equivalent to adding after recovery device 1
offset += recoveryDevice.getLength() * 1.05; // = equivalent to adding after recovery device 1 break;
case 2:
case 3:
// Rule 2: Add to first body tube, 1.125 calibers from the top
parentBodyTube = bodyTubes.get(0);
break;
case 4:
// Check if there is a vent band
BodyTube ventBand = null;
for (BodyTube tube : bodyTubes) {
if (tube.getLength() <= 1.6 * tube.getOuterRadius()) { // 0.8 calibers
ventBand = tube;
break;
}
}
if (ventBand != null) {
// Rule 3: Add to the tube above the vent band, 1.125 calibers from the top
int index = bodyTubes.indexOf(ventBand);
int parentIndex = Math.max(index - 1, 0);
parentBodyTube = bodyTubes.get(parentIndex);
} else {
// Rule 4: Add to the second tube, 1.125 calibers from the top
parentBodyTube = bodyTubes.get(1);
}
break; break;
default: default:
// Rule 2 & 3: If there are two, three or more body tubes, add the recovery device to the first body tube // Rule 4: Add to the second tube, 1.125 calibers from the top
bodyTube = bodyTubes.get(0); parentBodyTube = bodyTubes.get(1);
offset = bodyTube.getOuterRadius() * 1.125;
break; break;
} }
// Add the recovery device to the rocket // Add the recovery device to the rocket
bodyTube.addChild(recoveryDevice); parentBodyTube.addChild(recoveryDevice);
// Position the recovery device
offset += parentBodyTube.getOuterRadius() * 2.25; // 1.125 calibers
recoveryDevice.setAxialMethod(AxialMethod.TOP); recoveryDevice.setAxialMethod(AxialMethod.TOP);
if (offset + recoveryDevice.getLength() > bodyTube.getLength()) { if (offset + recoveryDevice.getLength() > parentBodyTube.getLength()) {
offset = 0; offset = 0;
} }
recoveryDevice.setAxialOffset(offset); recoveryDevice.setAxialOffset(offset);