Surrounding property was added
This commit is contained in:
@@ -16,7 +16,7 @@ namespace StructureHelperCommon.Models.Forces
|
||||
public string Name { get; set; }
|
||||
public bool SetInGravityCenter { get; set; }
|
||||
/// <inheritdoc/>
|
||||
public IPoint2D ForcePoint { get; private set; }
|
||||
public IPoint2D ForcePoint { get; set; }
|
||||
/// <inheritdoc/>
|
||||
public IForceTuple FullSLSForces { get; private set; }
|
||||
/// <inheritdoc/>
|
||||
@@ -29,10 +29,15 @@ namespace StructureHelperCommon.Models.Forces
|
||||
SetInGravityCenter = true;
|
||||
ForcePoint = new Point2D();
|
||||
FullSLSForces = new ForceTuple();
|
||||
LongTermFactor = 1d;
|
||||
ULSFactor = 1.2d;
|
||||
}
|
||||
public List<IDesignForceTuple> GetCombination()
|
||||
public IForceCombinationList GetCombinations()
|
||||
{
|
||||
var result = new List<IDesignForceTuple>();
|
||||
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)
|
||||
@@ -42,11 +47,21 @@ namespace StructureHelperCommon.Models.Forces
|
||||
{
|
||||
var termFactor = calcTerm is CalcTerms.ShortTerm ? 1d : LongTermFactor;
|
||||
var designForceTuple = new DesignForceTuple() { LimitState = limitState, CalcTerm = calcTerm };
|
||||
designForceTuple.ForceTuple = ForceTupleService.MultiplyTuples(designForceTuple.ForceTuple, stateFactor * termFactor);
|
||||
result.Add(designForceTuple);
|
||||
designForceTuple.ForceTuple = ForceTupleService.MultiplyTuples(FullSLSForces, stateFactor * termFactor);
|
||||
result.DesignForces.Add(designForceTuple);
|
||||
}
|
||||
}
|
||||
return result;
|
||||
}
|
||||
|
||||
public object Clone()
|
||||
{
|
||||
var newItem = new ForceCombinationByFactor();
|
||||
ForceActionService.CopyActionProps(this, newItem);
|
||||
newItem.FullSLSForces = FullSLSForces.Clone() as IForceTuple;
|
||||
newItem.LongTermFactor = LongTermFactor;
|
||||
newItem.ULSFactor = ULSFactor;
|
||||
return newItem;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user