Change curvature calculator
This commit is contained in:
@@ -14,6 +14,8 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
{
|
||||
public class CircleTriangulationLogicOptions : IShapeTriangulationLogicOptions
|
||||
{
|
||||
private IForceTupleServiceLogic forceTupleServiceLogic;
|
||||
private IForceTupleServiceLogic ForceTupleServiceLogic => forceTupleServiceLogic ??= new ForceTupleServiceLogic();
|
||||
public ICircleShape Circle { get;}
|
||||
|
||||
public IPoint2D Center { get; set; }
|
||||
@@ -32,7 +34,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
Circle = new CircleShape() { Diameter = primitive.Width };
|
||||
DivisionSize = primitive.DivisionSize;
|
||||
HeadMaterial = primitive.NdmElement.HeadMaterial;
|
||||
Prestrain = ForceTupleService.SumTuples(primitive.NdmElement.UsersPrestrain, primitive.NdmElement.AutoPrestrain) as StrainTuple;
|
||||
Prestrain = ForceTupleServiceLogic.SumTuples(primitive.NdmElement.UsersPrestrain, primitive.NdmElement.AutoPrestrain) as StrainTuple;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -15,6 +15,8 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
{
|
||||
public class LinePolygonTriangulationLogicOption : IShapeTriangulationLogicOptions
|
||||
{
|
||||
private IForceTupleServiceLogic forceTupleServiceLogic;
|
||||
private IForceTupleServiceLogic ForceTupleServiceLogic => forceTupleServiceLogic ??= new ForceTupleServiceLogic();
|
||||
public IPoint2D Center { get; set; }
|
||||
public IDivisionSize DivisionSize { get; set; }
|
||||
public ITriangulationOptions TriangulationOptions { get; set; }
|
||||
@@ -29,7 +31,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
TriangulationOptions = triangulationOptions;
|
||||
Shape = primitive.Shape;
|
||||
HeadMaterial = primitive.NdmElement.HeadMaterial;
|
||||
Prestrain = ForceTupleService.SumTuples(primitive.NdmElement.UsersPrestrain, primitive.NdmElement.AutoPrestrain) as StrainTuple;
|
||||
Prestrain = ForceTupleServiceLogic.SumTuples(primitive.NdmElement.UsersPrestrain, primitive.NdmElement.AutoPrestrain) as StrainTuple;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -12,6 +12,8 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
/// </summary>
|
||||
public class PointTriangulationLogicOptions : ITriangulationLogicOptions
|
||||
{
|
||||
private IForceTupleServiceLogic forceTupleServiceLogic;
|
||||
private IForceTupleServiceLogic ForceTupleServiceLogic => forceTupleServiceLogic ??= new ForceTupleServiceLogic();
|
||||
public ITriangulationOptions TriangulationOptions { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
@@ -29,7 +31,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
Center = primitive.Center.Clone() as Point2D;
|
||||
Area = primitive.Area;
|
||||
HeadMaterial = primitive.NdmElement.HeadMaterial;
|
||||
Prestrain = ForceTupleService.SumTuples(primitive.NdmElement.UsersPrestrain, primitive.NdmElement.AutoPrestrain) as StrainTuple;
|
||||
Prestrain = ForceTupleServiceLogic.SumTuples(primitive.NdmElement.UsersPrestrain, primitive.NdmElement.AutoPrestrain) as StrainTuple;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -17,6 +17,8 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
{
|
||||
internal class RebarTriangulationLogic : ITriangulationLogic
|
||||
{
|
||||
private IForceTupleServiceLogic forceTupleServiceLogic;
|
||||
private IForceTupleServiceLogic ForceTupleServiceLogic => forceTupleServiceLogic ??= new ForceTupleServiceLogic();
|
||||
private readonly RebarTriangulationLogicOptions options;
|
||||
public RebarTriangulationLogic(ITriangulationLogicOptions options)
|
||||
{
|
||||
@@ -60,7 +62,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
.HeadMaterial
|
||||
.GetLoaderMaterial(options.TriangulationOptions.LimiteState, options.TriangulationOptions.CalcTerm);
|
||||
|
||||
var prestrain = ForceTupleService.SumTuples(hostPrimitive.NdmElement.UsersPrestrain,
|
||||
var prestrain = ForceTupleServiceLogic.SumTuples(hostPrimitive.NdmElement.UsersPrestrain,
|
||||
hostPrimitive.NdmElement.AutoPrestrain)
|
||||
as StrainTuple;
|
||||
|
||||
|
||||
@@ -13,6 +13,8 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
{
|
||||
public class RebarTriangulationLogicOptions : ITriangulationLogicOptions
|
||||
{
|
||||
private IForceTupleServiceLogic forceTupleServiceLogic;
|
||||
private IForceTupleServiceLogic ForceTupleServiceLogic => forceTupleServiceLogic ??= new ForceTupleServiceLogic();
|
||||
public ITriangulationOptions TriangulationOptions { get; set; }
|
||||
/// <summary>
|
||||
///
|
||||
@@ -32,7 +34,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
Area = primitive.Area;
|
||||
HeadMaterial = primitive.NdmElement.HeadMaterial;
|
||||
HostPrimitive = primitive.HostPrimitive;
|
||||
Prestrain = ForceTupleService.SumTuples(primitive.NdmElement.UsersPrestrain, primitive.NdmElement.AutoPrestrain) as StrainTuple;
|
||||
Prestrain = ForceTupleServiceLogic.SumTuples(primitive.NdmElement.UsersPrestrain, primitive.NdmElement.AutoPrestrain) as StrainTuple;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
@@ -10,6 +10,8 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
/// <inheritdoc />
|
||||
public class RectangleTriangulationLogicOptions : IShapeTriangulationLogicOptions
|
||||
{
|
||||
private IForceTupleServiceLogic forceTupleServiceLogic;
|
||||
private IForceTupleServiceLogic ForceTupleServiceLogic => forceTupleServiceLogic ??= new ForceTupleServiceLogic();
|
||||
/// <inheritdoc />
|
||||
public IPoint2D Center { get; set; }
|
||||
/// <inheritdoc />
|
||||
@@ -41,7 +43,7 @@ namespace StructureHelperLogics.NdmCalculations.Triangulations
|
||||
DivisionSize.NdmMaxSize = primitive.DivisionSize.NdmMaxSize;
|
||||
DivisionSize.NdmMinDivision = primitive.DivisionSize.NdmMinDivision;
|
||||
HeadMaterial = primitive.NdmElement.HeadMaterial;
|
||||
Prestrain = ForceTupleService.SumTuples(primitive.NdmElement.UsersPrestrain, primitive.NdmElement.AutoPrestrain) as StrainTuple;
|
||||
Prestrain = ForceTupleServiceLogic.SumTuples(primitive.NdmElement.UsersPrestrain, primitive.NdmElement.AutoPrestrain) as StrainTuple;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user