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

[fix] get{Next|Prev}SymmetricComponent now searches across stages

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-05-03 15:01:56 -04:00
parent 0c47f2eba3
commit d8a8c14449
1 changed files with 45 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -570,14 +570,30 @@ public abstract class SymmetricComponent extends BodyComponent implements Radial
return null; return null;
} }
int pos = parent.getChildPosition(this); // might be: (a) Rocket -- for centerline stages
while( 0 < pos ) { // (b) BodyTube -- for Parallel Stages
--pos; final AxialStage stage = this.getStage();
final RocketComponent comp = parent.getChild(pos); final RocketComponent stageParent = stage.getParent();
if (comp instanceof SymmetricComponent) { // note: this is not guaranteed to _contain_ a stage... but that we're _searching_ for one.
return (SymmetricComponent) comp; int stageIndex = stageParent.getChildPosition(stage);
int symmetricIndex = this.parent.getChildPosition(this)-1;
while( 0 <= stageIndex ) {
final RocketComponent prevStage = stageParent.getChild(stageIndex);
if(prevStage instanceof AxialStage){
while (0 <= symmetricIndex) {
final RocketComponent previousSymmetric = prevStage.getChild(symmetricIndex);
if (previousSymmetric instanceof SymmetricComponent) {
return (SymmetricComponent) previousSymmetric;
}
--symmetricIndex;
}
} }
--stageIndex;
symmetricIndex = prevStage.getChildCount() - 1;
} }
return null; return null;
} }
@ -591,16 +607,31 @@ public abstract class SymmetricComponent extends BodyComponent implements Radial
if(null == this.parent) { if(null == this.parent) {
return null; return null;
} }
int pos = parent.getChildPosition(this);
++pos;
while( pos < parent.getChildCount() ) {
final RocketComponent comp = parent.getChild(pos);
++pos;
if (comp instanceof SymmetricComponent) { // might be: (a) Rocket -- for centerline stages
return (SymmetricComponent) comp; // (b) BodyTube -- for Parallel Stages
final AxialStage stage = this.getStage();
final RocketComponent stageParent = stage.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;
while(stageIndex < stageParent.getChildCount()) {
final RocketComponent nextStage = stageParent.getChild(stageIndex);
if(nextStage instanceof AxialStage){
while (symmetricIndex < nextStage.getChildCount()) {
final RocketComponent nextSymmetric = nextStage.getChild(symmetricIndex);
if (nextSymmetric instanceof SymmetricComponent) {
return (SymmetricComponent) nextSymmetric;
}
++symmetricIndex;
}
} }
++stageIndex;
symmetricIndex = nextStage.getChildCount() - 1;
} }
return null; return null;
} }