Refactoring: add some button icons

This commit is contained in:
Evgeny Redikultsev
2024-11-16 22:34:34 +05:00
parent 28f031764c
commit 6ec68c6f49
42 changed files with 1140 additions and 369 deletions

View File

@@ -22,7 +22,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
public List<INdmPrimitive> Primitives { get; private set; } = new();
public ICompressedMember CompressedMember { get; set; } = new CompressedMember() { Buckling = false};
public IAccuracy Accuracy { get; set; } = new Accuracy() {IterationAccuracy = 0.001d, MaxIterationCount = 1000};
public List<IForceCombinationList> ForceCombinationLists { get; set; }
//public List<IForceCombinationList> ForceCombinationLists { get; set; }
public ForceCalculatorInputData(Guid id)
{

View File

@@ -12,12 +12,15 @@ using StructureHelperLogics.Services.NdmPrimitives;
namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
{
/// <inheritdoc/>
public class ForceCalculatorLogic : IForceCalculatorLogic
{
private ForcesResults result;
private IProcessorLogic<IForceTuple> eccentricityLogic;
private ForceTupleBucklingLogic bucklingLogic;
private ITriangulatePrimitiveLogic triangulateLogic;
private List<IForceCombinationList> combinationLists;
public IForceCalculatorInputData InputData { get; set; }
public IShiftTraceLogger? TraceLogger { get; set; }
public Action<IResult> ActionToOutputResults { get; set; }
@@ -37,7 +40,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
{
IsValid = true
};
foreach (var combination in InputData.ForceCombinationLists)
foreach (var combination in combinationLists)
{
foreach (var tuple in combination.DesignForces)
{
@@ -176,10 +179,10 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
private void GetCombinations()
{
InputData.ForceCombinationLists = new List<IForceCombinationList>();
combinationLists = new List<IForceCombinationList>();
foreach (var item in InputData.ForceActions)
{
InputData.ForceCombinationLists.Add(item.GetCombinations());
combinationLists.AddRange(item.GetCombinations());
}
}

View File

@@ -14,9 +14,9 @@ using StructureHelperLogics.Services;
namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
{
/// <inheritdoc/>
public class ForceTupleCalculator : IForceTupleCalculator
{
IForceTupleTraceResultLogic forceTupleTraceResultLogic;
IForcesTupleResult result;
private ICheckInputDataLogic<IForceTupleInputData> checkInputDataLogic;
private IForceTupleCalcLogic calcLogic;

View File

@@ -7,12 +7,26 @@ using StructureHelperLogics.NdmCalculations.Primitives;
namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
{
/// <summary>
/// Input data fo roce tuple calculator
/// </summary>
public interface IForceCalculatorInputData : IInputData, ISaveable, IHasPrimitives, IHasForceActions
{
/// <summary>
/// Accuracy of calculating
/// </summary>
IAccuracy Accuracy { get; set; }
List<CalcTerms> CalcTermsList { get; }
ICompressedMember CompressedMember { get; set; }
List<IForceCombinationList> ForceCombinationLists { get; set; }
/// <summary>
/// List of limit states, available for calculating
/// </summary>
List<LimitStates> LimitStatesList { get; }
/// <summary>
/// List of type of duration, available for calculation
/// </summary>
List<CalcTerms> CalcTermsList { get; }
/// <summary>
/// Settings for calculating of stability fo compressed members
/// </summary>
ICompressedMember CompressedMember { get; set; }
}
}

View File

@@ -8,6 +8,9 @@ using System.Threading.Tasks;
namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
{
/// <summary>
/// Logic for processing of calculation for ForceTuplaCalculator
/// </summary>
public interface IForceCalculatorLogic : ILogic, IHasActionByResult
{
IForceCalculatorInputData InputData { get; set; }

View File

@@ -7,8 +7,14 @@ using System.Threading.Tasks;
namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
{
/// <summary>
/// Calculator for obtaining solution from loader calculator
/// </summary>
public interface IForceTupleCalculator : ICalculator, IHasActionByResult
{
/// <summary>
/// Input data for analysis
/// </summary>
IForceTupleInputData InputData {get;set;}
}
}

View File

@@ -15,7 +15,7 @@ namespace StructureHelperLogics.NdmCalculations.Analyses.ByForces
public interface IForceTupleInputData : IInputData
{
/// <summary>
/// Collection of ndma-parts for calculation
/// Collection of ndm-parts for calculation
/// </summary>
IEnumerable<INdm> NdmCollection { get; set; }
/// <summary>