From 010c4b41d9c52061b6f80e9231ebe1fdf49a2153 Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Tue, 5 Jun 2012 18:10:04 +0000 Subject: [PATCH] Discovered a couple more shape parameter values used in RockSim csv files. git-svn-id: https://openrocket.svn.sourceforge.net/svnroot/openrocket/trunk@757 180e2498-e6e9-4542-8430-84ac67f01cd8 --- .../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 55fb3942..05ea4e88 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); } -- 2.30.2