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

New Icons and Zoom of graph were added

Browse Source
This commit is contained in:
Evgeny Redikultsev
2023-09-17 11:37:29 +05:00
parent 1ed2ba8cf1
commit 9884a0919c
131 changed files with 714 additions and 216 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
StructureHelperLogics/Models/Materials/ConcreteLibMaterial.cs
View File

@@ -4,6 +4,7 @@ using StructureHelperCommon.Models.Materials.Libraries;
using LMBuilders = LoaderCalculator.Data.Materials.MaterialBuilders;
using LMLogic = LoaderCalculator.Data.Materials.MaterialBuilders.MaterialLogics;
using LM = LoaderCalculator.Data.Materials;
using LoaderCalculator.Data.Materials;
namespace StructureHelperLogics.Models.Materials
{
@@ -40,16 +41,27 @@ namespace StructureHelperLogics.Models.Materials
public LM.IMaterial GetLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
{
optionLogic = new MaterialCommonOptionLogic(MaterialEntity, limitState, calcTerm);
optionLogic.SetMaterialOptions(lmOptions);
optionLogic = new ConcreteMaterialOptionLogic(this, limitState);
optionLogic.SetMaterialOptions(lmOptions);
GetOptions(limitState, calcTerm, false);
LMBuilders.IBuilderDirector director = GetMaterial(limitState, calcTerm);
return director.BuildMaterial();
}
private LMBuilders.IBuilderDirector GetMaterial(LimitStates limitState, CalcTerms calcTerm)
{
var strength = factorLogic.GetTotalFactor(limitState, calcTerm);
lmOptions.ExternalFactor.Compressive = strength.Compressive;
lmOptions.ExternalFactor.Tensile = strength.Tensile;
LMBuilders.IMaterialBuilder builder = new LMBuilders.ConcreteBuilder(lmOptions);
LMBuilders.IBuilderDirector director = new LMBuilders.BuilderDirector(builder);
return director.BuildMaterial();
return director;
}
private void GetOptions(LimitStates limitState, CalcTerms calcTerm, bool isSectionCracked)
{
optionLogic = new MaterialCommonOptionLogic(MaterialEntity, limitState, calcTerm);
optionLogic.SetMaterialOptions(lmOptions);
optionLogic = new ConcreteMaterialOptionLogic(this, limitState, isSectionCracked);
optionLogic.SetMaterialOptions(lmOptions);
}
public (double Compressive, double Tensile) GetStrength(LimitStates limitState, CalcTerms calcTerm)
@@ -68,5 +80,12 @@ namespace StructureHelperLogics.Models.Materials
}
return (strength.Compressive * compressionFactor, strength.Tensile * tensionFactor);
}
public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
{
GetOptions(limitState, calcTerm, true);
LMBuilders.IBuilderDirector director = GetMaterial(limitState, calcTerm);
return director.BuildMaterial();
}
}
}

5
StructureHelperLogics/Models/Materials/ElasticMaterial.cs
View File

@@ -36,5 +36,10 @@ namespace StructureHelperLogics.Models.Materials
updateStrategy.Update(newItem, this);
return newItem;
}
public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
{
return GetLoaderMaterial(limitState, calcTerm);
}
}
}

5
StructureHelperLogics/Models/Materials/FRMaterials/FRMaterial.cs
View File

@@ -64,5 +64,10 @@ namespace StructureHelperLogics.Models.Materials
var material = elasticMaterialLogic.GetLoaderMaterial(this, limitState, calcTerm, factor);
return material;
}
public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
{
return GetLoaderMaterial(limitState, calcTerm);
}
}
}

5
StructureHelperLogics/Models/Materials/HeadMaterial.cs
View File

@@ -61,5 +61,10 @@ namespace StructureHelper.Models.Materials
{
throw new NotImplementedException();
}
public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
{
return HelperMaterial.GetCrackedLoaderMaterial(limitState, calcTerm);
}
}
}

1
StructureHelperLogics/Models/Materials/IHeadMaterial.cs
View File

@@ -17,5 +17,6 @@ namespace StructureHelper.Models.Materials
Color Color { get; set; }
IHelperMaterial HelperMaterial { get; set; }
IMaterial GetLoaderMaterial(LimitStates limitState, CalcTerms calcTerm);
IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm);
}
}

1
StructureHelperLogics/Models/Materials/IHelperMaterial.cs
View File

@@ -10,5 +10,6 @@ namespace StructureHelperLogics.Models.Materials
public interface IHelperMaterial : ICloneable
{
IMaterial GetLoaderMaterial(LimitStates limitState, CalcTerms calcTerm);
IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm);
}
}

8
StructureHelperLogics/Models/Materials/LibMaterial.cs
View File

@@ -1,4 +1,5 @@
using StructureHelperCommon.Infrastructures.Enums;
using LoaderCalculator.Data.Materials;
using StructureHelperCommon.Infrastructures.Enums;
using StructureHelperCommon.Infrastructures.Exceptions;
using StructureHelperCommon.Models.Materials.Libraries;
using System.Collections.Generic;
@@ -91,5 +92,10 @@ namespace StructureHelperLogics.Models.Materials
{
throw new NotImplementedException();
}
public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
{
throw new NotImplementedException();
}
}
}

9
StructureHelperLogics/Models/Materials/Logics/ConcreteMaterialOptionLogic.cs
View File

@@ -14,16 +14,23 @@ namespace StructureHelperLogics.Models.Materials
{
private IConcreteLibMaterial material;
private LimitStates limitState;
public ConcreteMaterialOptionLogic(IConcreteLibMaterial material, LimitStates limitState)
bool IsMaterialCracked;
public ConcreteMaterialOptionLogic(IConcreteLibMaterial material, LimitStates limitState, bool IsMaterialCracked)
{
this.material = material;
this.limitState = limitState;
this.IsMaterialCracked = IsMaterialCracked;
}
public void SetMaterialOptions(LCMB.IMaterialOptions materialOptions)
{
Check(materialOptions);
var concreteOptions = materialOptions as LCMB.ConcreteOptions;
concreteOptions.WorkInTension = false;
if (IsMaterialCracked)
{
concreteOptions.WorkInTension = true;
return;
}
if (limitState == LimitStates.ULS & material.TensionForULS == true)
{
concreteOptions.WorkInTension = true;

7
StructureHelperLogics/Models/Materials/ReinforcementLibMaterial.cs
View File

@@ -8,7 +8,7 @@ using System.Threading.Tasks;
using Loadermaterials = LoaderCalculator.Data.Materials;
using LMBuilders = LoaderCalculator.Data.Materials.MaterialBuilders;
using LoaderMaterialLogics = LoaderCalculator.Data.Materials.MaterialBuilders.MaterialLogics;
using LoaderCalculator.Data.Materials;
namespace StructureHelperLogics.Models.Materials
{
@@ -76,5 +76,10 @@ namespace StructureHelperLogics.Models.Materials
var tensileStrength = strength.Tensile * tensionFactor;
return (compressiveStrength, tensileStrength);
}
public IMaterial GetCrackedLoaderMaterial(LimitStates limitState, CalcTerms calcTerm)
{
return GetLoaderMaterial(limitState, calcTerm);
}
}
}