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

Merge pull request #9 from RedikultsevEvg/PrimitivePropsEdit

Browse Source 
Primitive props edit
This commit is contained in:
Ivan Ivashkin
2024-10-08 11:30:21 +05:00
committed by GitHub
parent ccc9513416 2c5c5db43a
commit 72add44fe7
109 changed files with 1780 additions and 208 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
StructureHelperCommon/Models/Analyses/DateVersion.cs
View File

@@ -9,8 +9,18 @@ namespace StructureHelperCommon.Models.Analyses
{
public class DateVersion : IDateVersion
{
public Guid Id { get; }
public DateTime DateTime { get; set; }
public ISaveable AnalysisVersion { get; set; }
public ISaveable Item { get; set; }
public DateVersion(Guid id)
{
Id = id;
}
public DateVersion() : this (Guid.NewGuid())
{
}
}
}

4
StructureHelperCommon/Models/Analyses/IDateVersion.cs
View File

@@ -7,9 +7,9 @@ using System.Threading.Tasks;
namespace StructureHelperCommon.Models.Analyses
{
public interface IDateVersion
public interface IDateVersion : ISaveable
{
DateTime DateTime { get; set; }
ISaveable Item { get; set; }
ISaveable AnalysisVersion { get; set; }
}
}

4
StructureHelperCommon/Models/Analyses/VersionProcessor.cs
View File

@@ -19,7 +19,7 @@ namespace StructureHelperCommon.Models.Analyses
Id = id;
Versions = new();
}
public VersionProcessor() : this (new Guid())
public VersionProcessor() : this (Guid.NewGuid())
{
}
@@ -34,7 +34,7 @@ namespace StructureHelperCommon.Models.Analyses
var version = new DateVersion()
{
DateTime = DateTime.Now,
Item = newItem
AnalysisVersion = newItem
};
AddVersion(version);
}

13
StructureHelperCommon/Models/Calculators/IHasCalculators.cs Normal file
View File

@@ -0,0 +1,13 @@
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace StructureHelperCommon.Models.Calculators
{
public interface IHasCalculators
{
List<ICalculator> Calculators { get; }
}
}

2
StructureHelperCommon/Models/Loggers/LoggerStrings.cs
View File

@@ -15,6 +15,6 @@ namespace StructureHelperCommon.Models.Loggers
public static string Summary => "Summary";
public static string Maximum => "Maximum";
public static string Minimum => "Minimum";
public static string CalculatorType(object obj) => string.Format("Calculator type: {0}", obj.GetType());
public static string LogicType(object obj) => string.Format("Logic type: {0}", obj.GetType());
}
}

7
StructureHelperCommon/Models/Materials/ConcreteCurveLogic.cs
View File

@@ -2,6 +2,7 @@
using LoaderCalculator.Data.Materials.MaterialBuilders;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using System;
namespace StructureHelperCommon.Models.Materials
{
@@ -12,6 +13,7 @@ namespace StructureHelperCommon.Models.Materials
private ConcreteLogicOptions options;
public Guid Id { get; private set; }
public string Name { get; set; }
public IMaterialLogicOptions Options
{
@@ -29,6 +31,11 @@ namespace StructureHelperCommon.Models.Materials
public MaterialTypes MaterialType { get; set; }
public DiagramType DiagramType { get; set; }
public ConcreteCurveLogic(Guid id)
{
Id = id;
}
public IMaterial GetLoaderMaterial()
{
GetLoaderOptions();

21
StructureHelperCommon/Models/Materials/Factories/MaterialLogicsFactory.cs
View File

@@ -15,9 +15,24 @@ namespace StructureHelperCommon.Models.Materials
{
var items = new List<IMaterialLogic>()
{
new ReinforcementByBuilderLogic() { MaterialType = MaterialTypes.Reinforcement, Name="Bilinear", DiagramType = DiagramType.Bilinear},
new ReinforcementByBuilderLogic() { MaterialType = MaterialTypes.Reinforcement, Name="Triplelinear", DiagramType = DiagramType.TripleLinear},
new ConcreteCurveLogic() { MaterialType = MaterialTypes.Concrete, Name = "Curve", DiagramType = DiagramType.Curve},
new ReinforcementByBuilderLogic(Guid.Parse("54c4fe40-8f82-4995-8930-81e65e97edb9"))
{
MaterialType = MaterialTypes.Reinforcement,
Name="Bilinear",
DiagramType = DiagramType.Bilinear
},
new ReinforcementByBuilderLogic(Guid.Parse("c658b71d-13b1-458c-a1b0-c93d1324acad"))
{
MaterialType = MaterialTypes.Reinforcement,
Name="Triplelinear",
DiagramType = DiagramType.TripleLinear
},
new ConcreteCurveLogic(Guid.Parse("b97e8168-76a1-4e24-ae98-9aa38edd1e9a"))
{
MaterialType = MaterialTypes.Concrete,
Name = "Curve",
DiagramType = DiagramType.Curve
},
};
return items;
}

3
StructureHelperCommon/Models/Materials/IMaterialLogic.cs
View File

@@ -1,6 +1,7 @@
using LoaderCalculator.Data.Materials;
using LoaderCalculator.Data.Materials.MaterialBuilders;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Interfaces;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -9,7 +10,7 @@ using System.Threading.Tasks;
namespace StructureHelperCommon.Models.Materials
{
public interface IMaterialLogic
public interface IMaterialLogic : ISaveable
{
string Name { get; set; }
IMaterialLogicOptions Options { get; set; }

5
StructureHelperCommon/Models/Materials/Libraries/Logics/MaterialPartialFactorUpdateStrategy.cs
View File

@@ -1,4 +1,5 @@
using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Services;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -7,10 +8,12 @@ using System.Threading.Tasks;
namespace StructureHelperCommon.Models.Materials.Libraries
{
internal class MaterialPartialFactorUpdateStrategy : IUpdateStrategy<IMaterialPartialFactor>
public class MaterialPartialFactorUpdateStrategy : IUpdateStrategy<IMaterialPartialFactor>
{
public void Update(IMaterialPartialFactor targetObject, IMaterialPartialFactor sourceObject)
{
CheckObject.IsNull(sourceObject);
CheckObject.IsNull(targetObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
targetObject.LimitState = sourceObject.LimitState;
targetObject.StressState = sourceObject.StressState;

5
StructureHelperCommon/Models/Materials/Libraries/Logics/MaterialSafetyFactorUpdateStrategy.cs
View File

@@ -1,4 +1,5 @@
using StructureHelperCommon.Infrastructures.Interfaces;
using StructureHelperCommon.Services;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -7,10 +8,12 @@ using System.Threading.Tasks;
namespace StructureHelperCommon.Models.Materials.Libraries
{
internal class MaterialSafetyFactorUpdateStrategy : IUpdateStrategy<IMaterialSafetyFactor>
public class MaterialSafetyFactorUpdateStrategy : IUpdateStrategy<IMaterialSafetyFactor>
{
public void Update(IMaterialSafetyFactor targetObject, IMaterialSafetyFactor sourceObject)
{
CheckObject.IsNull(sourceObject);
CheckObject.IsNull(targetObject);
if (ReferenceEquals(targetObject, sourceObject)) { return; }
targetObject.Name = sourceObject.Name;
targetObject.Take = sourceObject.Take;

15
StructureHelperCommon/Models/Materials/Libraries/MaterialPartialFactor.cs
View File

@@ -1,5 +1,6 @@
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Infrastructures.Interfaces;
using System;
namespace StructureHelperCommon.Models.Materials.Libraries
@@ -7,16 +8,18 @@ namespace StructureHelperCommon.Models.Materials.Libraries
public class MaterialPartialFactor : IMaterialPartialFactor
{
private double factorValue;
private IUpdateStrategy<IMaterialPartialFactor> updateStrategy = new MaterialPartialFactorUpdateStrategy();
public Guid Id { get; }
public StressStates StressState { get; set; }
public CalcTerms CalcTerm { get; set; }
public LimitStates LimitState { get; set; }
public StressStates StressState { get; set; } = StressStates.Compression;
public CalcTerms CalcTerm { get; set; } = CalcTerms.LongTerm;
public LimitStates LimitState { get; set; } = LimitStates.ULS;
public double FactorValue
{
get => factorValue;
set
{
if (value < 0 )
if (value < 0)
{
throw new StructureHelperException(ErrorStrings.FactorMustBeGraterThanZero);
}
@@ -28,9 +31,6 @@ namespace StructureHelperCommon.Models.Materials.Libraries
public MaterialPartialFactor(Guid id)
{
Id = id;
StressState = StressStates.Compression;
LimitState = LimitStates.ULS;
CalcTerm = CalcTerms.LongTerm;
FactorValue = 1d;
}
@@ -40,7 +40,6 @@ namespace StructureHelperCommon.Models.Materials.Libraries
public object Clone()
{
var newItem = new MaterialPartialFactor();
var updateStrategy = new MaterialPartialFactorUpdateStrategy();
updateStrategy.Update(newItem, this);
return newItem;
}

6
StructureHelperCommon/Models/Materials/ReinforcementByBuilderLogic.cs
View File

@@ -3,6 +3,7 @@ using LoaderCalculator.Data.Materials.MaterialBuilders;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Services;
using System;
namespace StructureHelperCommon.Models.Materials
{
@@ -12,6 +13,7 @@ namespace StructureHelperCommon.Models.Materials
private ReinforcementOptions materialOptions;
private IMaterialOptionLogic optionLogic;
public Guid Id { get; private set; }
public string Name { get; set; }
public DiagramType DiagramType { get; set; }
public IMaterialLogicOptions Options
@@ -26,6 +28,10 @@ namespace StructureHelperCommon.Models.Materials
public MaterialTypes MaterialType { get; set; }
public ReinforcementByBuilderLogic(Guid id)
{
Id = id;
}
public IMaterial GetLoaderMaterial()
{
GetLoaderOptions();

2
StructureHelperCommon/Models/Sections/Logics/RcAccEccentricityLogic.cs
View File

@@ -40,7 +40,7 @@ namespace StructureHelperCommon.Models.Sections.Logics
public (double ex, double ey) GetValue()
{
eccentricityLogic.TraceLogger = TraceLogger?.GetSimilarTraceLogger(50);
TraceLogger?.AddMessage(LoggerStrings.CalculatorType(this), TraceLogStatuses.Service);
TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
TraceLogger?.AddMessage(string.Format(accEccMessage, "x"));
eccentricityLogic.Length = Length;
eccentricityLogic.Size = SizeX;

2
StructureHelperCommon/Models/Sections/Logics/RcEccentricityAxisLogic.cs
View File

@@ -30,7 +30,7 @@ namespace StructureHelperCommon.Models.Sections.Logics
}
public double GetValue()
{
TraceLogger?.AddMessage(LoggerStrings.CalculatorType(this), TraceLogStatuses.Service);
TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
var lengthEccetricity = Length / lengthFactor;
TraceLogger?.AddMessage(string.Format("Length of member = {0}(m)", Length));
TraceLogger?.AddMessage(string.Format("Accidental eccentricity by length e,a = {0}(m) / {1} = {2}(m)", Length, lengthFactor, lengthEccetricity));

2
StructureHelperCommon/Models/Sections/Logics/RcEccentricityLogic.cs
View File

@@ -51,7 +51,7 @@ namespace StructureHelperCommon.Models.Sections
public IForceTuple GetValue()
{
TraceLogger?.AddMessage(LoggerStrings.CalculatorType(this), TraceLogStatuses.Service);
TraceLogger?.AddMessage(LoggerStrings.LogicType(this), TraceLogStatuses.Service);
if (InputForceTuple is null)
{
string errorString = ErrorStrings.NullReference + $": {nameof(InputForceTuple)}";