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

[fix] Fin tabs are now more resistant to non-physical / error states

Browse Source
This commit is contained in:
Daniel_M_Williams 2020-05-10 17:39:02 -04:00 committed by Billy Olsen
parent 7886712321
commit 3f0a5b1780
1 changed files with 10 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
core/src/net/sf/openrocket/rocketcomponent/FinSet.java
View File

@ -299,7 +299,7 @@ public abstract class FinSet extends ExternalComponent implements RingInstanceab
/** /**
* internally, set the internal offset and optionally validate tab * internally, set the internal offset and optionally validate tab
* *
* @param offsetRequest new requested shift of tab -- from * @param offsetRequest new requested tob offset
*/ */
public void setTabOffset( final double offsetRequest) { public void setTabOffset( final double offsetRequest) {
tabOffset = offsetRequest; tabOffset = offsetRequest;
@ -345,14 +345,19 @@ public abstract class FinSet extends ExternalComponent implements RingInstanceab
//check front bounds: //check front bounds:
if( tabPosition < 0){ if( tabPosition < 0){
this.tabPosition = 0; this.tabPosition = 0;
} }
//check tail bounds: //check tail bounds:
final double xTabBack = getTabTrailingEdge(); if (this.length < tabPosition ) {
this.tabPosition = length;
}
final double xTabBack = getTabTrailingEdge();
if( this.length < xTabBack ){ if( this.length < xTabBack ){
this.tabLength -= (xTabBack - this.length); this.tabLength -= (xTabBack - this.length);
} }
tabLength = Math.max(0, tabLength);
// check tab height // check tab height
if( null != getParent() ){ if( null != getParent() ){
// pulls the parent-body radius at the fin-tab reference point. // pulls the parent-body radius at the fin-tab reference point.