Discovered a couple more shape parameter values used in RockSim csv files.

[debian/openrocket] / core / src / net / sf / openrocket / preset / loader / ShapeColumnParser.java

diff --git a/core/src/net/sf/openrocket/preset/loader/ShapeColumnParser.java b/core/src/net/sf/openrocket/preset/loader/ShapeColumnParser.java
index 55fb39425e12276882e26027b1f7c56b4395c57a..05ea4e88bb15b621889365975bd98d44e1894b6f 100644 (file)
--- a/core/src/net/sf/openrocket/preset/loader/ShapeColumnParser.java
+++ b/core/src/net/sf/openrocket/preset/loader/ShapeColumnParser.java
@@ -39,12 +39,22 @@ public class ShapeColumnParser extends BaseColumnParser {
                if ( "power-series".equals(lc) ) {
                        shape = Shape.POWER;
                }
+               // guessing at what "ps" means.  I think it might be power series.
+               if ( "ps".equals(lc) ) {
+                       shape = Shape.POWER;
+               }
                if ( "1".equals(lc) ) {
                        shape = Shape.OGIVE;
                }
                if( "0". equals(lc) ) {
                        shape = Shape.CONICAL;
                }
+               if( "". equals(lc) ) {
+                       shape = Shape.CONICAL;
+               }
+               if ( "3".equals(lc) ) {
+                       shape = Shape.ELLIPSOID;
+               }
                if ( shape == null ) {
                        throw new BugException("Invalid shape parameter: " + columnData);
                }