From fa7f7635ca7fe0f1ec5c058432f9139b2a371a13 Mon Sep 17 00:00:00 2001 From: SiboVG Date: Tue, 28 Mar 2023 18:37:32 +0200 Subject: [PATCH] [#1826] Fill in gaps in multi-sim editing --- .../simulation/SimulationOptions.java | 29 +++++++++++++------ 1 file changed, 20 insertions(+), 9 deletions(-) diff --git a/core/src/net/sf/openrocket/simulation/SimulationOptions.java b/core/src/net/sf/openrocket/simulation/SimulationOptions.java index 0025c1f5b..84c20313e 100644 --- a/core/src/net/sf/openrocket/simulation/SimulationOptions.java +++ b/core/src/net/sf/openrocket/simulation/SimulationOptions.java @@ -442,10 +442,6 @@ public class SimulationOptions implements ChangeSource, Cloneable { isChanged = true; this.launchLongitude = src.launchLongitude; } - if (this.launchPressure != src.launchPressure) { - isChanged = true; - this.launchPressure = src.launchPressure; - } if (this.launchRodAngle != src.launchRodAngle) { isChanged = true; this.launchRodAngle = src.launchRodAngle; @@ -458,19 +454,26 @@ public class SimulationOptions implements ChangeSource, Cloneable { isChanged = true; this.launchRodLength = src.launchRodLength; } + if (this.launchIntoWind != src.launchIntoWind) { + isChanged = true; + this.launchIntoWind = src.launchIntoWind; + } + if (this.useISA != src.useISA) { + isChanged = true; + this.useISA = src.useISA; + } if (this.launchTemperature != src.launchTemperature) { isChanged = true; this.launchTemperature = src.launchTemperature; } + if (this.launchPressure != src.launchPressure) { + isChanged = true; + this.launchPressure = src.launchPressure; + } if (this.maximumAngle != src.maximumAngle) { isChanged = true; this.maximumAngle = src.maximumAngle; } - this.maximumAngle = src.maximumAngle; - if (this.timeStep != src.timeStep) { - isChanged = true; - this.timeStep = src.timeStep; - } if (this.windAverage != src.windAverage) { isChanged = true; this.windAverage = src.windAverage; @@ -487,6 +490,14 @@ public class SimulationOptions implements ChangeSource, Cloneable { isChanged = true; this.calculateExtras = src.calculateExtras; } + if (this.timeStep != src.timeStep) { + isChanged = true; + this.timeStep = src.timeStep; + } + if (this.geodeticComputation != src.geodeticComputation) { + isChanged = true; + this.geodeticComputation = src.geodeticComputation; + } if (isChanged) { // Only copy the randomSeed if something else has changed.