From 03a6e614b8ad7559efd5995348330f2eb790154c Mon Sep 17 00:00:00 2001 From: JoePfeiffer Date: Mon, 9 Oct 2023 10:15:12 -0600 Subject: [PATCH] load/save optimum delay time --- .../net/sf/openrocket/file/openrocket/OpenRocketSaver.java | 2 ++ .../file/openrocket/importt/FlightDataHandler.java | 7 ++++++- 2 files changed, 8 insertions(+), 1 deletion(-) diff --git a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java index 048db84c4..12e056f75 100644 --- a/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java +++ b/core/src/net/sf/openrocket/file/openrocket/OpenRocketSaver.java @@ -401,6 +401,8 @@ public class OpenRocketSaver extends RocketSaver { str += " launchrodvelocity=\"" + TextUtil.doubleToString(data.getLaunchRodVelocity()) + "\""; if (!Double.isNaN(data.getDeploymentVelocity())) str += " deploymentvelocity=\"" + TextUtil.doubleToString(data.getDeploymentVelocity()) + "\""; + if (!Double.isNaN(data.getOptimumDelay())) + str += " optimumdelay=\"" + TextUtil.doubleToString(data.getOptimumDelay()) + "\""; str += ">"; writeln(str); indent++; diff --git a/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataHandler.java b/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataHandler.java index c5d766458..d23537401 100644 --- a/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataHandler.java +++ b/core/src/net/sf/openrocket/file/openrocket/importt/FlightDataHandler.java @@ -104,6 +104,7 @@ class FlightDataHandler extends AbstractElementHandler { double groundHitVelocity = Double.NaN; double launchRodVelocity = Double.NaN; double deploymentVelocity = Double.NaN; + double optimumDelay = Double.NaN; try { maxAltitude = DocumentConfig.stringToDouble(attributes.get("maxaltitude")); @@ -142,9 +143,13 @@ class FlightDataHandler extends AbstractElementHandler { deploymentVelocity = DocumentConfig.stringToDouble(attributes.get("deploymentvelocity")); } catch (NumberFormatException ignore) { } + try { + optimumDelay = DocumentConfig.stringToDouble(attributes.get("optimumdelay")); + } catch (NumberFormatException ignore) { + } data = new FlightData(maxAltitude, maxVelocity, maxAcceleration, maxMach, - timeToApogee, flightTime, groundHitVelocity, launchRodVelocity, deploymentVelocity); + timeToApogee, flightTime, groundHitVelocity, launchRodVelocity, deploymentVelocity, optimumDelay); } data.getWarningSet().addAll(warningSet);