From 8d90c8aae4d77b97d88f1d0d7f3e837b78fab7ba Mon Sep 17 00:00:00 2001 From: kruland2607 Date: Sun, 14 Apr 2013 18:44:29 -0500 Subject: [PATCH] When importing from RockSim, don't complain about spill holes in parachutes when the hole has radius 0. --- .../sf/openrocket/file/rocksim/importt/ParachuteHandler.java | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/core/src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java b/core/src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java index 3c8693cbb..eb2ec4564 100644 --- a/core/src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java +++ b/core/src/net/sf/openrocket/file/rocksim/importt/ParachuteHandler.java @@ -91,7 +91,9 @@ class ParachuteHandler extends RecoveryDeviceHandler { if (RocksimCommonConstants.SPILL_HOLE_DIA.equals(element)) { //Not supported in OpenRocket double spillHoleRadius = Double.parseDouble(content) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_RADIUS; - warnings.add("Parachute spill holes are not supported. Ignoring."); + if (spillHoleRadius > 0) { + warnings.add("Parachute spill holes are not supported. Ignoring."); + } } if (RocksimCommonConstants.SHROUD_LINE_MASS_PER_MM.equals(element)) { shroudLineDensity = Double.parseDouble(content) / RocksimCommonConstants.ROCKSIM_TO_OPENROCKET_LINE_DENSITY;