From 0823de5e2ab2f4cd7f6d9f96f6bce019f77be214 Mon Sep 17 00:00:00 2001 From: Daniel_M_Williams Date: Thu, 4 Apr 2019 19:08:45 -0400 Subject: [PATCH] [fix #497] Disables Fin-Thickness-Warnings on Phantom Fins --- .../net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java | 4 ++-- .../sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java index 4e97a8300..8f7b80c51 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/FinSetCalc.java @@ -65,7 +65,7 @@ public class FinSetCalc extends RocketComponentCalc { FinSet fin = (FinSet) component; thickness = fin.getThickness(); - bodyRadius = fin.getFinFront().y; + bodyRadius = fin.getBodyRadius(); finCount = fin.getFinCount(); baseRotation = fin.getBaseRotation(); @@ -101,7 +101,7 @@ public class FinSetCalc extends RocketComponentCalc { } // Add warnings (radius/2 == diameter/4) - if (thickness > bodyRadius / 2) { + if( (0 < bodyRadius) && (thickness > bodyRadius / 2)){ warnings.add(Warning.THICK_FIN); } warnings.addAll(geometryWarnings); diff --git a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java index 1efab0c04..4e045f2f0 100644 --- a/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java +++ b/core/src/net/sf/openrocket/aerodynamics/barrowman/TubeFinSetCalc.java @@ -110,7 +110,7 @@ public class TubeFinSetCalc extends RocketComponentCalc { } // Add warnings (radius/2 == diameter/4) - if (thickness > bodyRadius / 2) { + if( (0 < bodyRadius) && (thickness > bodyRadius / 2)){ warnings.add(Warning.THICK_FIN); } warnings.add(new Other("Tube fin support is experimental"));