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

[fix] SymmetricComponent.getNextSymmetricComponent() now handles PodSets

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-05-16 11:31:16 -04:00
parent ce6a6fa2e3
commit 462a65bba3
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
core/src/net/sf/openrocket/rocketcomponent/SymmetricComponent.java
View File

@ -608,21 +608,21 @@ public abstract class SymmetricComponent extends BodyComponent implements Radial
return null; return null;
} }
final ComponentAssembly assembly = this.getAssembly();
// might be: (a) Rocket -- for centerline stages // might be: (a) Rocket -- for centerline stages
// (b) BodyTube -- for Parallel Stages // (b) BodyTube -- for Parallel Stages
final AxialStage stage = this.getStage(); final RocketComponent assemblyParent = assembly.getParent();
final RocketComponent stageParent = stage.getParent();
// note: this is not guaranteed to _contain_ a stage... but that we're _searching_ for one. // note: this is not guaranteed to _contain_ a stage... but that we're _searching_ for one.
int stageIndex = stageParent.getChildPosition(stage); int assemblyIndex = assemblyParent.getChildPosition(assembly);
int symmetricIndex = this.parent.getChildPosition(this) + 1; int symmetricIndex = this.parent.getChildPosition(this) + 1;
while(stageIndex < stageParent.getChildCount()) { while(assemblyIndex < assemblyParent.getChildCount()) {
final RocketComponent nextStage = stageParent.getChild(stageIndex); final RocketComponent searchAssembly = assemblyParent.getChild(assemblyIndex);
if(nextStage instanceof AxialStage){ if(searchAssembly instanceof ComponentAssembly){
while (symmetricIndex < nextStage.getChildCount()) { while (symmetricIndex < searchAssembly.getChildCount()) {
final RocketComponent nextSymmetric = nextStage.getChild(symmetricIndex); final RocketComponent nextSymmetric = searchAssembly.getChild(symmetricIndex);
if (nextSymmetric instanceof SymmetricComponent) { if (nextSymmetric instanceof SymmetricComponent) {
return (SymmetricComponent) nextSymmetric; return (SymmetricComponent) nextSymmetric;
@ -630,8 +630,8 @@ public abstract class SymmetricComponent extends BodyComponent implements Radial
++symmetricIndex; ++symmetricIndex;
} }
} }
++stageIndex; ++assemblyIndex;
symmetricIndex = nextStage.getChildCount() - 1; symmetricIndex = searchAssembly.getChildCount() - 1;
} }
return null; return null;
} }