From 0d69cc221e0acd9082c2342fb39277b1a33787d2 Mon Sep 17 00:00:00 2001 From: Robert McIntosh <261477+rwmcintosh@users.noreply.github.com> Date: Mon, 14 Aug 2023 11:44:16 -0400 Subject: [PATCH 1/2] Fixes #2073 Allow simple properties to be copied from SimulationConfiguration --- .../Domain/Builder/SimulationConfiguration.cs | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/OSPSuite.Core/Domain/Builder/SimulationConfiguration.cs b/src/OSPSuite.Core/Domain/Builder/SimulationConfiguration.cs index b2a1a2c5d..be2292dd7 100644 --- a/src/OSPSuite.Core/Domain/Builder/SimulationConfiguration.cs +++ b/src/OSPSuite.Core/Domain/Builder/SimulationConfiguration.cs @@ -48,15 +48,20 @@ public void UpdatePropertiesFrom(IUpdatable source, ICloneManager cloneManager) if (!(source is SimulationConfiguration sourceConfiguration)) return; - SimModelExportMode = sourceConfiguration.SimModelExportMode; - ShouldValidate = sourceConfiguration.ShouldValidate; - ShowProgress = sourceConfiguration.ShowProgress; - PerformCircularReferenceCheck = sourceConfiguration.PerformCircularReferenceCheck; + CopyPropertiesFrom(sourceConfiguration); sourceConfiguration.ExpressionProfiles.Each(x => AddExpressionProfile(cloneManager.Clone(x))); sourceConfiguration.AllCalculationMethods.Each(AddCalculationMethod); sourceConfiguration.ModuleConfigurations.Each(x => AddModuleConfiguration(cloneManager.Clone(x))); SimulationSettings = cloneManager.Clone(sourceConfiguration.SimulationSettings); Individual = cloneManager.Clone(sourceConfiguration.Individual); } + + public void CopyPropertiesFrom(SimulationConfiguration sourceConfiguration) + { + SimModelExportMode = sourceConfiguration.SimModelExportMode; + ShouldValidate = sourceConfiguration.ShouldValidate; + ShowProgress = sourceConfiguration.ShowProgress; + PerformCircularReferenceCheck = sourceConfiguration.PerformCircularReferenceCheck; + } } } \ No newline at end of file From d7c537ed25f4d1647a854836dbbe1e60fcd79ffb Mon Sep 17 00:00:00 2001 From: Robert McIntosh <261477+rwmcintosh@users.noreply.github.com> Date: Tue, 15 Aug 2023 09:04:24 -0400 Subject: [PATCH 2/2] PR feedback --- src/OSPSuite.Core/Domain/Builder/SimulationConfiguration.cs | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/OSPSuite.Core/Domain/Builder/SimulationConfiguration.cs b/src/OSPSuite.Core/Domain/Builder/SimulationConfiguration.cs index be2292dd7..90f7f9ce4 100644 --- a/src/OSPSuite.Core/Domain/Builder/SimulationConfiguration.cs +++ b/src/OSPSuite.Core/Domain/Builder/SimulationConfiguration.cs @@ -56,6 +56,11 @@ public void UpdatePropertiesFrom(IUpdatable source, ICloneManager cloneManager) Individual = cloneManager.Clone(sourceConfiguration.Individual); } + /// + /// Copies the properties from but does not clone any of the building blocks + /// or module configurations. + /// + /// public void CopyPropertiesFrom(SimulationConfiguration sourceConfiguration) { SimModelExportMode = sourceConfiguration.SimModelExportMode;