From 312e90b9f7eaa4c2cc1321c250d259854262635b Mon Sep 17 00:00:00 2001 From: Billy Olsen Date: Wed, 16 Dec 2020 20:07:54 -0700 Subject: [PATCH] Restore default fin count to 3 for TrapezoidFinSet TrapezoidFinSet fin count was reduced to 1 in previous commits in order to fix a bug. The actual problem was that the instancecount was not persisted in the ork file. This change restores the default to 3. Fixes #850 Signed-off-by: Billy Olsen --- .../net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java | 2 +- core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java | 6 ++++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/core/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java b/core/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java index b8a92a993..57f72a0e4 100644 --- a/core/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java +++ b/core/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java @@ -39,7 +39,7 @@ public class TrapezoidFinSet extends FinSet { public TrapezoidFinSet() { - this(1, 0.05, 0.05, 0.025, 0.03); + this(3, 0.05, 0.05, 0.025, 0.03); } // TODO: HIGH: height=0 -> CP = NaN diff --git a/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java b/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java index 15a39a401..7970d2cac 100644 --- a/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java +++ b/core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java @@ -17,6 +17,12 @@ public class FinSetTest extends BaseTestCase { public void testMultiplicity() { final EllipticalFinSet fins = new EllipticalFinSet(); assertEquals(3, fins.getFinCount()); + + final FreeformFinSet freeFins = new FreeformFinSet(); + assertEquals(3, freeFins.getFinCount()); + + final TrapezoidFinSet trapFins = new TrapezoidFinSet(); + assertEquals(3, trapFins.getFinCount()); } /**