From fb1262897dc3d3db68c4ea2017d7abff8c8e8ab1 Mon Sep 17 00:00:00 2001
From: Kevin Ruland <kruland@sunflower.com>
Date: Tue, 5 Jun 2012 18:10:04 +0000
Subject: [PATCH] Discovered a couple more shape parameter values used in
 RockSim csv files.

---
 .../sf/openrocket/preset/loader/ShapeColumnParser.java | 10 ++++++++++
 1 file changed, 10 insertions(+)

diff --git a/core/src/net/sf/openrocket/preset/loader/ShapeColumnParser.java b/core/src/net/sf/openrocket/preset/loader/ShapeColumnParser.java
index 55fb39425..05ea4e88b 100644
--- 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);
 		}