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

Restore default fin count to 3 for TrapezoidFinSet

Browse Source 
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 <billy.olsen@gmail.com>
This commit is contained in:
Billy Olsen 2020-12-16 20:07:54 -07:00 committed by Billy Olsen
parent 95f6f3c245
commit 312e90b9f7
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/src/net/sf/openrocket/rocketcomponent/TrapezoidFinSet.java
View File

@ -39,7 +39,7 @@ public class TrapezoidFinSet extends FinSet {
public TrapezoidFinSet() { 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 // TODO: HIGH: height=0 -> CP = NaN

6
core/test/net/sf/openrocket/rocketcomponent/FinSetTest.java
View File

@ -17,6 +17,12 @@ public class FinSetTest extends BaseTestCase {
public void testMultiplicity() { public void testMultiplicity() {
final EllipticalFinSet fins = new EllipticalFinSet(); final EllipticalFinSet fins = new EllipticalFinSet();
assertEquals(3, fins.getFinCount()); assertEquals(3, fins.getFinCount());
final FreeformFinSet freeFins = new FreeformFinSet();
assertEquals(3, freeFins.getFinCount());
final TrapezoidFinSet trapFins = new TrapezoidFinSet();
assertEquals(3, trapFins.getFinCount());
} }
/** /**