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

Merge pull request #535 from teyrana/fix_497

Browse Source 
[fix #497] Disables Fin-Thickness-Warnings on Phantom Fins
This commit is contained in:
Wes Cravens 2019-05-29 10:25:24 -05:00 committed by GitHub
commit 7acaaf18d5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java
View File

@ -65,7 +65,7 @@ public class FinSetCalc extends RocketComponentCalc {
FinSet fin = (FinSet) component; FinSet fin = (FinSet) component;
thickness = fin.getThickness(); thickness = fin.getThickness();
bodyRadius = fin.getFinFront().y; bodyRadius = fin.getBodyRadius();
finCount = fin.getFinCount(); finCount = fin.getFinCount();
baseRotation = fin.getBaseRotation(); baseRotation = fin.getBaseRotation();
@ -101,7 +101,7 @@ public class FinSetCalc extends RocketComponentCalc {
} }
// Add warnings (radius/2 == diameter/4) // Add warnings (radius/2 == diameter/4)
if (thickness > bodyRadius / 2) { if( (0 < bodyRadius) && (thickness > bodyRadius / 2)){
warnings.add(Warning.THICK_FIN); warnings.add(Warning.THICK_FIN);
} }
warnings.addAll(geometryWarnings); warnings.addAll(geometryWarnings);

2
core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java
View File

@ -110,7 +110,7 @@ public class TubeFinSetCalc extends RocketComponentCalc {
} }
// Add warnings (radius/2 == diameter/4) // Add warnings (radius/2 == diameter/4)
if (thickness > bodyRadius / 2) { if( (0 < bodyRadius) && (thickness > bodyRadius / 2)){
warnings.add(Warning.THICK_FIN); warnings.add(Warning.THICK_FIN);
} }
warnings.add(new Other("Tube fin support is experimental")); warnings.add(new Other("Tube fin support is experimental"));