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

Check for tube children for motor mounts

Browse Source
This commit is contained in:
SiboVG 2023-03-28 23:03:08 +02:00
parent f9bfb1fe43
commit b696e6f4b1
1 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
core/src/net/sf/openrocket/file/rasaero/export/SimulationListDTO.java
View File

@ -45,9 +45,26 @@ public class SimulationListDTO {
continue;
}
for (RocketComponent stageChild : stage.getChildren()) {
// We can only really use body tubes as motor mounts, since other stuff (e.g. inner tube) is not supported in RASAero
if (stageChild instanceof BodyTube && ((BodyTube) stageChild).hasMotor()) {
mounts.put(stage, (BodyTube) stageChild);
if (stageChild instanceof BodyTube) {
// First check if the body tube itself has a motor
if (((BodyTube) stageChild).hasMotor()) {
mounts.put(stage, (BodyTube) stageChild);
break;
}
// Then check if it has an inner tube with a motor
else {
boolean addedMount = false;
for (RocketComponent tubeChild : stageChild.getChildren()) {
if (tubeChild instanceof MotorMount && ((MotorMount) tubeChild).hasMotor()) {
mounts.put(stage, (MotorMount) tubeChild);
addedMount = true;
break;
}
}
if (addedMount) {
break;
}
}
}
}
}