avpon/StructureHelper
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Change value diagram calculator

Browse Source
This commit is contained in:
Evgeny Redikultsev
2025-11-16 21:03:57 +05:00
parent f7e60e0bb3
commit 215f631bb0
170 changed files with 2108 additions and 387 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
DataAccess/DTOs/Converters/BeamShears/BeamShearActionFromDTOConvertStrategy.cs
View File

@@ -29,9 +29,9 @@ namespace DataAccess.DTOs
private void CheckObjects(BeamShearActionDTO source)
{
CheckObject.IsNull(source);
CheckObject.IsNull(source.ExternalForce);
CheckObject.IsNull(source.SupportAction);
CheckObject.ThrowIfNull(source);
CheckObject.ThrowIfNull(source.ExternalForce);
CheckObject.ThrowIfNull(source.SupportAction);
}
private void GetNewAction(BeamShearActionDTO source)

6
DataAccess/DTOs/Converters/BeamShears/BeamShearAxisActionFromDTOConvertStrategy.cs
View File

@@ -18,9 +18,9 @@ namespace DataAccess.DTOs
public override BeamShearAxisAction GetNewItem(BeamShearAxisActionDTO source)
{
CheckObject.IsNull(source);
CheckObject.IsNull(source.SupportForce);
CheckObject.IsNull(source.ShearLoads);
CheckObject.ThrowIfNull(source);
CheckObject.ThrowIfNull(source.SupportForce);
CheckObject.ThrowIfNull(source.ShearLoads);
InitializeStrategies();
GetNewAction(source);
return NewItem;

4
DataAccess/DTOs/Converters/BeamShears/BeamShearCalculatorFromDTOConvertStrategy.cs
View File

@@ -18,8 +18,8 @@ namespace DataAccess.DTOs
public override BeamShearCalculator GetNewItem(BeamShearCalculatorDTO source)
{
CheckObject.IsNull(source);
CheckObject.IsNull(source.InputData);
CheckObject.ThrowIfNull(source);
CheckObject.ThrowIfNull(source.InputData);
GetNewCalculator(source);
return NewItem;
}

4
DataAccess/DTOs/Converters/BeamShears/BeamShearFromDTOConvertStrategy.cs
View File

@@ -16,8 +16,8 @@ namespace DataAccess.DTOs
public override BeamShear GetNewItem(BeamShearDTO source)
{
ChildClass = this;
CheckObject.IsNull(source);
CheckObject.IsNull(source.Repository);
CheckObject.ThrowIfNull(source);
CheckObject.ThrowIfNull(source.Repository);
GetNewBeamShear(source);
return NewItem;
}

2
DataAccess/DTOs/Converters/BeamShears/BeamSpanLoadFromDTOConvertStrategy.cs
View File

@@ -13,7 +13,7 @@ namespace DataAccess.DTOs
public override IBeamSpanLoad GetNewItem(IBeamSpanLoad source)
{
CheckObject.IsNull(source);
CheckObject.ThrowIfNull(source);
if (source is DistributedLoadDTO distributed)
{
ProcessDistributed(distributed);

8
DataAccess/DTOs/Converters/BeamShears/HasBeamShearActionsFromDTOUpdateStrategy.cs
View File

@@ -21,11 +21,11 @@ namespace DataAccess.DTOs
public void Update(IHasBeamShearActions targetObject, IHasBeamShearActions sourceObject)
{
CheckObject.IsNull(targetObject);
CheckObject.IsNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
CheckObject.IsNull(sourceObject.Actions);
CheckObject.IsNull(targetObject.Actions);
CheckObject.ThrowIfNull(sourceObject.Actions);
CheckObject.ThrowIfNull(targetObject.Actions);
targetObject.Actions.Clear();
foreach (var action in sourceObject.Actions)
{

8
DataAccess/DTOs/Converters/BeamShears/HasBeamShearActionsToDTOUpdateStrategy.cs
View File

@@ -18,11 +18,11 @@ namespace DataAccess.DTOs
public void Update(IHasBeamShearActions targetObject, IHasBeamShearActions sourceObject)
{
CheckObject.IsNull(targetObject);
CheckObject.IsNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
CheckObject.IsNull(sourceObject.Actions);
CheckObject.IsNull(targetObject.Actions);
CheckObject.ThrowIfNull(sourceObject.Actions);
CheckObject.ThrowIfNull(targetObject.Actions);
targetObject.Actions.Clear();
foreach (var action in sourceObject.Actions)
{

8
DataAccess/DTOs/Converters/BeamShears/HasBeamShearCalculatorsFromDTOUpdateStrategy.cs
View File

@@ -20,11 +20,11 @@ namespace DataAccess.DTOs
public void Update(IHasCalculators targetObject, IHasCalculators sourceObject)
{
CheckObject.IsNull(targetObject);
CheckObject.IsNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
CheckObject.IsNull(sourceObject.Calculators);
CheckObject.IsNull(targetObject.Calculators);
CheckObject.ThrowIfNull(sourceObject.Calculators);
CheckObject.ThrowIfNull(targetObject.Calculators);
targetObject.Calculators.Clear();
List<ICalculator> calculators = GetCalculators(sourceObject.Calculators);
targetObject.Calculators.AddRange(calculators);

8
DataAccess/DTOs/Converters/BeamShears/HasBeamShearCalculatorsToDTOUpdateStrategy.cs
View File

@@ -20,11 +20,11 @@ namespace DataAccess.DTOs
public void Update(IHasCalculators targetObject, IHasCalculators sourceObject)
{
CheckObject.IsNull(targetObject);
CheckObject.IsNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
CheckObject.IsNull(sourceObject.Calculators);
CheckObject.IsNull(targetObject.Calculators);
CheckObject.ThrowIfNull(sourceObject.Calculators);
CheckObject.ThrowIfNull(targetObject.Calculators);
targetObject.Calculators.Clear();
List<ICalculator> calculators = GetCalculators(sourceObject.Calculators);
targetObject.Calculators.AddRange(calculators);

8
DataAccess/DTOs/Converters/BeamShears/HasBeamShearSectionsFromDTOUpdateStrategy.cs
View File

@@ -20,11 +20,11 @@ namespace DataAccess.DTOs
public void Update(IHasBeamShearSections targetObject, IHasBeamShearSections sourceObject)
{
CheckObject.IsNull(targetObject);
CheckObject.IsNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
CheckObject.IsNull(sourceObject.Sections);
CheckObject.IsNull(targetObject.Sections);
CheckObject.ThrowIfNull(sourceObject.Sections);
CheckObject.ThrowIfNull(targetObject.Sections);
targetObject.Sections.Clear();
foreach (var section in sourceObject.Sections)
{

8
DataAccess/DTOs/Converters/BeamShears/HasBeamShearSectionsToDTORenameStrategy.cs
View File

@@ -19,11 +19,11 @@ namespace DataAccess.DTOs
public void Update(IHasBeamShearSections targetObject, IHasBeamShearSections sourceObject)
{
CheckObject.IsNull(targetObject);
CheckObject.IsNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
CheckObject.IsNull(sourceObject.Sections);
CheckObject.IsNull(targetObject.Sections);
CheckObject.ThrowIfNull(sourceObject.Sections);
CheckObject.ThrowIfNull(targetObject.Sections);
InitializeStrategies();
targetObject.Sections.Clear();
foreach (var section in sourceObject.Sections)

8
DataAccess/DTOs/Converters/BeamShears/HasStirrupsFromDTOUpdateStrategy.cs
View File

@@ -21,11 +21,11 @@ namespace DataAccess.DTOs
public void Update(IHasStirrups targetObject, IHasStirrups sourceObject)
{
CheckObject.IsNull(targetObject);
CheckObject.IsNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
CheckObject.IsNull(sourceObject.Stirrups);
CheckObject.IsNull(targetObject.Stirrups);
CheckObject.ThrowIfNull(sourceObject.Stirrups);
CheckObject.ThrowIfNull(targetObject.Stirrups);
targetObject.Stirrups.Clear();
List<IStirrup> stirrups = GetStirrups(sourceObject.Stirrups);
targetObject.Stirrups.AddRange(stirrups);

8
DataAccess/DTOs/Converters/BeamShears/HasStirrupsToDTOUpdateStrategy.cs
View File

@@ -21,11 +21,11 @@ namespace DataAccess.DTOs
public void Update(IHasStirrups targetObject, IHasStirrups sourceObject)
{
CheckObject.IsNull(targetObject);
CheckObject.IsNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
CheckObject.IsNull(sourceObject.Stirrups);
CheckObject.IsNull(targetObject.Stirrups);
CheckObject.ThrowIfNull(sourceObject.Stirrups);
CheckObject.ThrowIfNull(targetObject.Stirrups);
targetObject.Stirrups.Clear();
List<IStirrup> stirrups = GetStirrups(sourceObject.Stirrups);
targetObject.Stirrups.AddRange(stirrups);

6
DataAccess/DTOs/Converters/Forces/FactoredForceTupleFromDTOConvertStrategy.cs
View File

@@ -43,9 +43,9 @@ namespace DataAccess.DTOs
private static void CheckObjects(FactoredForceTupleDTO source)
{
CheckObject.IsNull(source);
CheckObject.IsNull(source.ForceTuple);
CheckObject.IsNull(source.CombinationProperty);
CheckObject.ThrowIfNull(source);
CheckObject.ThrowIfNull(source.ForceTuple);
CheckObject.ThrowIfNull(source.CombinationProperty);
}
private void InitializeStrategies()

2
DataAccess/DTOs/Converters/Forces/ForceFactoredListFromDTOConvertStrategy.cs
View File

@@ -47,7 +47,7 @@ namespace DataAccess.DTOs
private void SetForceTuples(ForceFactoredListDTO source, ForceFactoredList newItem)
{
CheckObject.IsNull(newItem.ForceTuples, nameof(newItem.ForceTuples));
CheckObject.ThrowIfNull(newItem.ForceTuples, nameof(newItem.ForceTuples));
newItem.ForceTuples.Clear();
foreach (var item in source.ForceTuples)
{

2
DataAccess/DTOs/Converters/HasForceActionsFromDTOUpdateStrategy.cs
View File

@@ -21,7 +21,7 @@ namespace DataAccess.DTOs
public void Update(IHasForceActions targetObject, IHasForceActions sourceObject)
{
CheckObject.IsNull(targetObject, sourceObject);
CheckObject.ThrowIfNull(targetObject, sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
targetObject.ForceActions.Clear();
foreach (var item in sourceObject.ForceActions)

4
DataAccess/DTOs/Converters/HasVisualPropertyFromDTOUpdateStrategy.cs
View File

@@ -20,8 +20,8 @@ namespace DataAccess.DTOs
public void Update(IHasVisualProperty targetObject, IHasVisualProperty sourceObject)
{
CheckObject.IsNull(targetObject);
CheckObject.IsNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
convertStrategy = new DictionaryConvertStrategy<PrimitiveVisualProperty, PrimitiveVisualPropertyDTO>(
referenceDictionary,

4
DataAccess/DTOs/Converters/HasVisualPropertyToDTOUpdateStrategy.cs
View File

@@ -20,8 +20,8 @@ namespace DataAccess.DTOs
public void Update(IHasVisualProperty targetObject, IHasVisualProperty sourceObject)
{
CheckObject.IsNull(targetObject);
CheckObject.IsNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
convertStrategy = new DictionaryConvertStrategy<PrimitiveVisualPropertyDTO, IPrimitiveVisualProperty>(
referenceDictionary,

4
DataAccess/DTOs/Converters/Materials/HelperMaterialDTOSafetyFactorUpdateStrategy.cs
View File

@@ -28,8 +28,8 @@ namespace DataAccess.DTOs
public void Update(IHelperMaterial targetObject, IHelperMaterial sourceObject)
{
CheckObject.IsNull(sourceObject);
CheckObject.IsNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
if (sourceObject.SafetyFactors is not null)
{

4
DataAccess/DTOs/Converters/Materials/LibMaterialDTOUpdateStrategy.cs
View File

@@ -16,8 +16,8 @@ namespace DataAccess.DTOs
/// <inheritdoc/>
public void Update(ILibMaterial targetObject, ILibMaterial sourceObject)
{
CheckObject.IsNull(sourceObject);
CheckObject.IsNull(targetObject);
CheckObject.ThrowIfNull(sourceObject);
CheckObject.ThrowIfNull(targetObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
}
}

2
DataAccess/DTOs/Converters/NdmCrossSections/HasPrimitivesFromDTOUpdateStrategy.cs
View File

@@ -15,7 +15,7 @@ namespace DataAccess.DTOs.Converters
public void Update(IHasPrimitives targetObject, IHasPrimitives sourceObject)
{
CheckObject.IsNull(targetObject, sourceObject);
CheckObject.ThrowIfNull(targetObject, sourceObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
targetObject.Primitives.Clear();
foreach (var item in sourceObject.Primitives)

6
DataAccess/DTOs/Converters/Shapes/Point2DRangeFromDTOConvertStrategy.cs
View File

@@ -34,9 +34,9 @@ namespace DataAccess.DTOs
private static void CheckSourceObject(Point2DRangeDTO source)
{
CheckObject.IsNull(source, ": point range source object");
CheckObject.IsNull(source.StartPoint + ": point range start point");
CheckObject.IsNull(source.EndPoint + ": point range end point");
CheckObject.ThrowIfNull(source, ": point range source object");
CheckObject.ThrowIfNull(source.StartPoint + ": point range start point");
CheckObject.ThrowIfNull(source.EndPoint + ": point range end point");
}
private void InitializeStrategies()

6
DataAccess/DTOs/Converters/ValueDiagrams/ValueDiagramCalculatorInputDataFromDTOConvertStrategy.cs
View File

@@ -27,14 +27,14 @@ namespace DataAccess.DTOs
updateStrategy.Update(NewItem, source);
ProcessPrimitives(source);
ProcessActions(source);
NewItem.Digrams.Clear();
foreach (var diagram in source.Digrams)
NewItem.Diagrams.Clear();
foreach (var diagram in source.Diagrams)
{
if (diagram is not ValueDiagramEntityDTO diagramDTO)
{
throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(diagram));
}
NewItem.Digrams.Add(diagramConvertStrategy.Convert(diagramDTO));
NewItem.Diagrams.Add(diagramConvertStrategy.Convert(diagramDTO));
}
return NewItem;
}

6
DataAccess/DTOs/Converters/ValueDiagrams/ValueDiagramCalculatorInputDataToDTOConvertStrategy.cs
View File

@@ -28,10 +28,10 @@ namespace DataAccess.DTOs
updateStrategy.Update(NewItem, source);
ProcessPrimitives(source);
ProcessActions(source);
NewItem.Digrams.Clear();
foreach (var diagram in source.Digrams)
NewItem.Diagrams.Clear();
foreach (var diagram in source.Diagrams)
{
NewItem.Digrams.Add(diagramConvertStrategy.Convert(diagram));
NewItem.Diagrams.Add(diagramConvertStrategy.Convert(diagram));
}
return NewItem;
}

6
DataAccess/DTOs/Converters/ValueDiagrams/ValueDiagramEntityFromDTOConvertStrategy.cs
View File

@@ -19,11 +19,11 @@ namespace DataAccess.DTOs
NewItem = new(source.Id);
InitializeStrategies();
updateStrategy.Update(NewItem, source);
if (source.ValueDigram is not ValueDiagramDTO diagramDTO)
if (source.ValueDiagram is not ValueDiagramDTO diagramDTO)
{
throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(source.ValueDigram));
throw new StructureHelperException(ErrorStrings.ObjectTypeIsUnknownObj(source.ValueDiagram));
}
NewItem.ValueDigram = diagramConvertStrategy.Convert(diagramDTO);
NewItem.ValueDiagram = diagramConvertStrategy.Convert(diagramDTO);
return NewItem;
}

2
DataAccess/DTOs/Converters/ValueDiagrams/ValueDiagramEntityToDTOConvertStrategy.cs
View File

@@ -18,7 +18,7 @@ namespace DataAccess.DTOs
NewItem = new(source.Id);
InitializeStrategies();
updateStrategy.Update(NewItem, source);
NewItem.ValueDigram = diagramConvertStrategy.Convert(source.ValueDigram);
NewItem.ValueDiagram = diagramConvertStrategy.Convert(source.ValueDiagram);
return NewItem;
}

2
DataAccess/DTOs/DTOEntities/ValueDiagrams/ValueDiagramCalculatorInputDataDTO.cs
View File

@@ -13,7 +13,7 @@ namespace DataAccess.DTOs
[JsonProperty("StateTermPair")]
public IStateCalcTermPair StateTermPair { get; set; } = new StateCalcTermPairDTO();
[JsonProperty("Diagrams")]
public List<IValueDiagramEntity> Digrams { get; } = [];
public List<IValueDiagramEntity> Diagrams { get; } = [];
[JsonProperty("CheckStrainLimits")]
public bool CheckStrainLimit { get; set; } = true;
[JsonProperty("ForceActions")]

2
DataAccess/DTOs/DTOEntities/ValueDiagrams/ValueDiagramEntityDTO.cs
View File

@@ -12,7 +12,7 @@ namespace DataAccess.DTOs
[JsonProperty("IsTaken")]
public bool IsTaken { get; set; }
[JsonProperty("ValueDiagram")]
public IValueDiagram ValueDigram { get; set; }
public IValueDiagram ValueDiagram { get; set; }
public ValueDiagramEntityDTO(Guid id)