DGP - Fix for bug#3032813

git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@61 180e2498-e6e9-4542-8430-84ac67f01cd8

diff --git a/src/net/sf/openrocket/file/rocksim/FinSetHandler.java b/src/net/sf/openrocket/file/rocksim/FinSetHandler.java
index 9b9239dc49ccc9641d7bcca7a5aeba4dccb15622..08c917775d81b3b3e15a369999050d9235ace233 100644 (file)
--- a/src/net/sf/openrocket/file/rocksim/FinSetHandler.java
+++ b/src/net/sf/openrocket/file/rocksim/FinSetHandler.java
@@ -277,7 +277,7 @@ class FinSetHandler extends ElementHandler {
         if (shapeCode == 0) {
             //Trapezoidal
             result = new TrapezoidFinSet();
-            ((TrapezoidFinSet) result).setFinShape(rootChord, tipChord, sweepDistance, midChordLen, thickness);
+            ((TrapezoidFinSet) result).setFinShape(rootChord, tipChord, sweepDistance, semiSpan, thickness);
         }
         else if (shapeCode == 1) {
             //Elliptical

diff --git a/test/net/sf/openrocket/file/rocksim/FinSetHandlerTest.java b/test/net/sf/openrocket/file/rocksim/FinSetHandlerTest.java
index 5b02142b5ffc58d679afa4ea4b9f16571e8466e5..1cc4792edda5d4bf13f15415f1ca5b87ea8b5058 100644 (file)
--- a/test/net/sf/openrocket/file/rocksim/FinSetHandlerTest.java
+++ b/test/net/sf/openrocket/file/rocksim/FinSetHandlerTest.java
@@ -104,6 +104,9 @@ public class FinSetHandlerTest extends TestCase {
         assertTrue(fins instanceof TrapezoidFinSet);
         assertEquals(4, fins.getFinCount());
 
+        assertEquals(0.012d, ((TrapezoidFinSet) fins).getHeight());
+        assertEquals(0.012d, fins.getSpan());
+        
         assertEquals(0.2d, fins.getThickness());
         assertEquals(0.4d, fins.getTabLength());
         assertEquals(0.5d, fins.getTabHeight());