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

[fixes #666] Find SymmetricComponent.PreviousSymmetricComponent now handles PodSets correctly.

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

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

@ -570,21 +570,21 @@ public abstract class SymmetricComponent extends BodyComponent implements Radial
return null;
}
// might be: (a) Rocket -- for centerline stages
// (b) BodyTube -- for Parallel Stages
final AxialStage stage = this.getStage();
final RocketComponent stageParent = stage.getParent();
final ComponentAssembly assembly = this.getAssembly();
// might be: (a) Rocket -- for Centerline/Axial stages
// (b) BodyTube -- for Parallel Stages & PodSets
final RocketComponent assemblyParent = assembly.getParent();
// note: this is not guaranteed to _contain_ a stage... but that we're _searching_ for one.
int stageIndex = stageParent.getChildPosition(stage);
int symmetricIndex = this.parent.getChildPosition(this)-1;
int assemblyIndex = assemblyParent.getChildPosition(assembly); // position of stage w/in parent
int symmetricIndex = this.parent.getChildPosition(this)-1; // guess at index of previous stage
while( 0 <= stageIndex ) {
final RocketComponent prevStage = stageParent.getChild(stageIndex);
while( 0 <= assemblyIndex ) {
final RocketComponent searchAssembly = assemblyParent.getChild(assemblyIndex);
if(prevStage instanceof AxialStage){
if(searchAssembly instanceof ComponentAssembly){
while (0 <= symmetricIndex) {
final RocketComponent previousSymmetric = prevStage.getChild(symmetricIndex);
final RocketComponent previousSymmetric = searchAssembly.getChild(symmetricIndex);
if (previousSymmetric instanceof SymmetricComponent) {
return (SymmetricComponent) previousSymmetric;
@ -592,8 +592,8 @@ public abstract class SymmetricComponent extends BodyComponent implements Radial
--symmetricIndex;
}
}
--stageIndex;
symmetricIndex = prevStage.getChildCount() - 1;
--assemblyIndex;
symmetricIndex = searchAssembly.getChildCount() - 1;
}
return null;
}