Fix error of cross-section cloning strategy

This commit is contained in:
Evgeny Redikultsev
2024-12-29 20:32:48 +05:00
parent bd0175086a
commit ba70e0d214
8 changed files with 42 additions and 31 deletions

View File

@@ -9,7 +9,7 @@ namespace StructureHelperLogics.Models.CrossSections
{
public class CrossSection : ICrossSection
{
private ICloneStrategy<ICrossSection> cloneStrategy = new CrossSectionCloneStrategy();
private ICloneStrategy<ICrossSection> cloneStrategy;
private IUpdateStrategy<ICrossSection> updateStrategy = new CrossSectionUpdateStrategy();
public ICrossSectionRepository SectionRepository { get; set; } = new CrossSectionRepository();
@@ -27,9 +27,7 @@ namespace StructureHelperLogics.Models.CrossSections
public object Clone()
{
//var newItem = new CrossSection();
//updateStrategy.Update(newItem, this);
//return newItem;
cloneStrategy = new CrossSectionCloneStrategy();
return cloneStrategy.GetClone(this);
}
}

View File

@@ -1,4 +1,5 @@
using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Settings;
namespace StructureHelperLogics.Models.CrossSections
{
@@ -12,13 +13,19 @@ namespace StructureHelperLogics.Models.CrossSections
this.repositoryCloneStrategy = repositoryCloneStrategy;
}
public CrossSectionCloneStrategy() : this (new CrossSectionRepositoryCloneStrategy())
public CrossSectionCloneStrategy(ICloningStrategy cloningStrategy) : this (new CrossSectionRepositoryCloneStrategy(cloningStrategy))
{
}
public CrossSectionCloneStrategy() : this (new DeepCloningStrategy())
{
}
public ICrossSection GetClone(ICrossSection sourceObject)
{
var project = ProgramSetting.CurrentProject;
ICrossSectionRepository newRepository = repositoryCloneStrategy.GetClone(sourceObject.SectionRepository);
targetObject = new()
{

View File

@@ -1,12 +1,9 @@
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Infrastructures.Settings;
using StructureHelperCommon.Models.Calculators;
using StructureHelperCommon.Models.Parameters;
using StructureHelperLogics.Models.Materials;
using StructureHelperLogics.Models.Materials.Logics;
using StructureHelperLogics.NdmCalculations.Analyses.ByForces;
using StructureHelperLogics.NdmCalculations.Analyses.ByForces.LimitCurve;
using StructureHelperLogics.NdmCalculations.Cracking;
using StructureHelperLogics.NdmCalculations.Primitives;
using StructureHelperLogics.NdmCalculations.Primitives.Logics;
@@ -36,13 +33,9 @@ namespace StructureHelperLogics.Models.CrossSections
this.calculatorsUpdateStrategy = calculatorsUpdateStrategy;
}
public CrossSectionRepositoryCloneStrategy() : this (
new DeepCloningStrategy(),
new HasForceActionUpdateCloningStrategy(null),
new HasMaterialsUpdateCloningStrategy(null),
new HasPrimitivesUpdateCloningStrategy(null),
new HasCalculatorsUpdateCloningStrategy(null))
{
public CrossSectionRepositoryCloneStrategy(ICloningStrategy cloningStrategy)
{
this.cloningStrategy = cloningStrategy;
forcesUpdateStrategy = new HasForceActionUpdateCloningStrategy(cloningStrategy);
materialsUpdateStrategy = new HasMaterialsUpdateCloningStrategy(cloningStrategy);
primitivesUpdateStrategy = new HasPrimitivesUpdateCloningStrategy(cloningStrategy);
@@ -51,6 +44,7 @@ namespace StructureHelperLogics.Models.CrossSections
public ICrossSectionRepository GetClone(ICrossSectionRepository sourceObject)
{
var project = ProgramSetting.CurrentProject;
targetRepository = new();
forcesUpdateStrategy.Update(targetRepository, sourceObject);
materialsUpdateStrategy.Update(targetRepository, sourceObject);