Refactoring: add some button icons
This commit is contained in:
@@ -14,52 +14,83 @@ namespace StructureHelperCommon.Models.Forces
|
||||
public class ForceCombinationByFactor : IForceCombinationByFactor
|
||||
{
|
||||
readonly IUpdateStrategy<IAction> updateStrategy = new ActionUpdateStrategy();
|
||||
private ForceCombinationList result;
|
||||
private List<LimitStates> limitStates;
|
||||
private List<CalcTerms> calcTerms;
|
||||
|
||||
/// <inheritdoc/>
|
||||
public Guid Id { get; }
|
||||
/// <inheritdoc/>
|
||||
public string Name { get; set; }
|
||||
public bool SetInGravityCenter { get; set; }
|
||||
public string Name { get; set; } = "New Factored Load";
|
||||
/// <inheritdoc/>
|
||||
public IPoint2D ForcePoint { get; set; }
|
||||
public LimitStates LimitState { get; set; } = LimitStates.SLS; //By default create characteristic value of forces
|
||||
/// <inheritdoc/>
|
||||
public IForceTuple FullSLSForces { get; set; }
|
||||
public CalcTerms CalcTerm { get; set; } = CalcTerms.ShortTerm; //By defult use full value of load
|
||||
public bool SetInGravityCenter { get; set; } = true;
|
||||
/// <inheritdoc/>
|
||||
public double ULSFactor { get; set; }
|
||||
public IPoint2D ForcePoint { get; set; } = new Point2D();
|
||||
/// <inheritdoc/>
|
||||
public double LongTermFactor { get; set; }
|
||||
|
||||
public IForceTuple FullSLSForces { get; set; } = new ForceTuple();
|
||||
/// <inheritdoc/>
|
||||
public double ULSFactor { get; set; } = 1.2d;
|
||||
/// <inheritdoc/>
|
||||
public double LongTermFactor { get; set; } = 1d;
|
||||
|
||||
public ForceCombinationByFactor(Guid id)
|
||||
{
|
||||
Id = id;
|
||||
Name = "New Factored Load";
|
||||
SetInGravityCenter = true;
|
||||
ForcePoint = new Point2D();
|
||||
FullSLSForces = new ForceTuple();
|
||||
LongTermFactor = 1d;
|
||||
ULSFactor = 1.2d;
|
||||
}
|
||||
public ForceCombinationByFactor() : this (Guid.NewGuid()) { }
|
||||
public IForceCombinationList GetCombinations()
|
||||
public IForceCombinationList GetCombination()
|
||||
{
|
||||
GetNewResult();
|
||||
ProcessResult();
|
||||
return result;
|
||||
}
|
||||
|
||||
private void ProcessResult()
|
||||
{
|
||||
var result = new ForceCombinationList();
|
||||
result.SetInGravityCenter = this.SetInGravityCenter;
|
||||
result.ForcePoint = this.ForcePoint;
|
||||
result.DesignForces.Clear();
|
||||
var limitStates = new List<LimitStates>() { LimitStates.ULS, LimitStates.SLS };
|
||||
var calcTerms = new List<CalcTerms>() { CalcTerms.ShortTerm, CalcTerms.LongTerm };
|
||||
foreach (var limitState in limitStates)
|
||||
{
|
||||
var stateFactor = limitState is LimitStates.SLS ? 1d : ULSFactor;
|
||||
foreach (var calcTerm in calcTerms)
|
||||
{
|
||||
var termFactor = calcTerm is CalcTerms.ShortTerm ? 1d : LongTermFactor;
|
||||
var designForceTuple = new DesignForceTuple() { LimitState = limitState, CalcTerm = calcTerm };
|
||||
designForceTuple.ForceTuple = ForceTupleService.MultiplyTuples(FullSLSForces, stateFactor * termFactor) as ForceTuple;
|
||||
result.DesignForces.Add(designForceTuple);
|
||||
}
|
||||
ProcessLimitState(limitState);
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
private void ProcessLimitState(LimitStates limitState)
|
||||
{
|
||||
var stateFactor = limitState is LimitStates.SLS ? 1d : ULSFactor;
|
||||
foreach (var calcTerm in calcTerms)
|
||||
{
|
||||
ProcessCalcTerm(limitState, stateFactor, calcTerm);
|
||||
}
|
||||
}
|
||||
|
||||
private void ProcessCalcTerm(LimitStates limitState, double stateFactor, CalcTerms calcTerm)
|
||||
{
|
||||
var termFactor = calcTerm is CalcTerms.ShortTerm ? 1d : LongTermFactor;
|
||||
var designForceTuple = new DesignForceTuple()
|
||||
{
|
||||
LimitState = limitState,
|
||||
CalcTerm = calcTerm
|
||||
};
|
||||
designForceTuple.ForceTuple = ForceTupleService.MultiplyTuples(FullSLSForces, stateFactor * termFactor) as ForceTuple;
|
||||
result.DesignForces.Add(designForceTuple);
|
||||
}
|
||||
|
||||
private void GetNewResult()
|
||||
{
|
||||
result = new ForceCombinationList();
|
||||
result.SetInGravityCenter = SetInGravityCenter;
|
||||
result.ForcePoint = ForcePoint;
|
||||
result.DesignForces.Clear();
|
||||
limitStates = new List<LimitStates>()
|
||||
{
|
||||
LimitStates.ULS, LimitStates.SLS
|
||||
};
|
||||
calcTerms = new List<CalcTerms>()
|
||||
{
|
||||
CalcTerms.ShortTerm, CalcTerms.LongTerm
|
||||
};
|
||||
}
|
||||
|
||||
public object Clone()
|
||||
@@ -68,5 +99,14 @@ namespace StructureHelperCommon.Models.Forces
|
||||
updateStrategy.Update(newItem, this);
|
||||
return newItem;
|
||||
}
|
||||
|
||||
public List<IForceCombinationList> GetCombinations()
|
||||
{
|
||||
var listResult = new List<IForceCombinationList>
|
||||
{
|
||||
GetCombination()
|
||||
};
|
||||
return listResult;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user