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

[fix] tightens up calculation of adjacent SymmetricComponents

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-08-14 18:51:54 -04:00
parent ac1d6b698a
commit eb197427f2
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -585,7 +585,6 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
// (b) BodyTube -- for Parallel Stages & PodSets // (b) BodyTube -- for Parallel Stages & PodSets
final RocketComponent grandParent = this.parent.getParent(); final RocketComponent grandParent = this.parent.getParent();
// note: this is not guaranteed to _contain_ a stage... but that we're _searching_ for one.
int searchParentIndex = grandParent.getChildPosition(this.parent); // position of stage w/in parent int searchParentIndex = grandParent.getChildPosition(this.parent); // position of stage w/in parent
int searchSiblingIndex = this.parent.getChildPosition(this)-1; // guess at index of previous stage int searchSiblingIndex = this.parent.getChildPosition(this)-1; // guess at index of previous stage
@ -595,7 +594,6 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
if(searchParent instanceof ComponentAssembly){ if(searchParent instanceof ComponentAssembly){
while (0 <= searchSiblingIndex) { while (0 <= searchSiblingIndex) {
final RocketComponent searchSibling = searchParent.getChild(searchSiblingIndex); final RocketComponent searchSibling = searchParent.getChild(searchSiblingIndex);
if (searchSibling instanceof SymmetricComponent) { if (searchSibling instanceof SymmetricComponent) {
return (SymmetricComponent) searchSibling; return (SymmetricComponent) searchSibling;
} }
@ -603,7 +601,9 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
} }
} }
--searchParentIndex; --searchParentIndex;
searchSiblingIndex = searchParent.getChildCount() - 1; if( 0 <= searchParentIndex){
searchSiblingIndex = grandParent.getChild(searchParentIndex).getChildCount() - 1;
}
} }
return null; return null;
} }
@ -640,7 +640,7 @@ public abstract class SymmetricComponent extends BodyComponent implements BoxBou
} }
} }
++searchParentIndex; ++searchParentIndex;
searchSiblingIndex = searchParent.getChildCount() - 1; searchSiblingIndex = 0;
} }
return null; return null;
} }