Add VisualAnalysisDTO

This commit is contained in:
Evgeny Redikultsev
2024-09-14 19:03:35 +05:00
parent 5a9e7c3c4f
commit c10d6eb94e
84 changed files with 958 additions and 410 deletions

View File

@@ -77,7 +77,7 @@ namespace StructureHelperTests.UnitTests.Ndms
_mockRebarPrimitive.Setup(x => x.HostPrimitive).Returns(mockHostPrimitive.Object);
_mockRebarPrimitive.Setup(x => x.Name).Returns("RebarName");
mockHostPrimitive.Setup(x => x.HeadMaterial).Returns(mockHeadMaterial.Object);
mockHostPrimitive.Setup(x => x.NdmElement.HeadMaterial).Returns(mockHeadMaterial.Object);
mockHeadMaterial.Setup(x => x.HelperMaterial).Returns(mockHelperMaterial.Object);
// Act

View File

@@ -56,7 +56,7 @@ public class CheckTupleCalculatorInputDataTests
// Arrange
_checkTupleCalculatorInputData.InputData = new TupleCrackInputData
{
Primitives = new List<INdmPrimitive> { new CirclePrimitive() }, // Assuming at least one valid primitive
Primitives = new List<INdmPrimitive> { new EllipsePrimitive() }, // Assuming at least one valid primitive
UserCrackInputData = null
};
@@ -74,7 +74,7 @@ public class CheckTupleCalculatorInputDataTests
// Arrange
_checkTupleCalculatorInputData.InputData = new TupleCrackInputData
{
Primitives = new List<INdmPrimitive> { new CirclePrimitive() }, // Assuming at least one valid primitive
Primitives = new List<INdmPrimitive> { new EllipsePrimitive() }, // Assuming at least one valid primitive
UserCrackInputData = new UserCrackInputData() // Assuming this is valid
};

View File

@@ -66,14 +66,23 @@ namespace StructureHelperTests.UnitTests.Ndms.Triangulations
//Arrange
ProgramSetting.NatSystem = NatSystems.RU;
var material = HeadMaterialFactory.GetHeadMaterial(HeadmaterialType.Concrete40);
var mainBlock = new RectanglePrimitive() { Width = width, Height = height, HeadMaterial = material };
var mainBlock = new RectanglePrimitive()
{
Width = width,
Height = height,
};
mainBlock.NdmElement.HeadMaterial = material;
mainBlock.Center.X = centerX;
mainBlock.Center.Y = centerY;
mainBlock.VisualProperty.ZIndex = 0;
var opening = new RectanglePrimitive()
{ Width = 0.3d, Height = 0.2d,
HeadMaterial = material, Triangulate = triangOpening,
ClearUnderlying = true};
{
Width = 0.3d,
Height = 0.2d
};
opening.DivisionSize.ClearUnderlying = true;
opening.NdmElement.HeadMaterial = material;
opening.NdmElement.Triangulate = triangOpening;
opening.VisualProperty.ZIndex = 1;
var primitives = new List<INdmPrimitive>() { mainBlock, opening };
//Act
@@ -100,19 +109,28 @@ namespace StructureHelperTests.UnitTests.Ndms.Triangulations
//Arrange
ProgramSetting.NatSystem = NatSystems.RU;
var material = HeadMaterialFactory.GetHeadMaterial(HeadmaterialType.Concrete40);
var mainBlock = new RectanglePrimitive() {Width = width, Height = height, HeadMaterial = material };
var mainBlock = new RectanglePrimitive()
{
Width = width,
Height = height
};
mainBlock.NdmElement.HeadMaterial = material;
mainBlock.Center.X = centerX;
mainBlock.Center.Y = centerY;
mainBlock.VisualProperty.ZIndex = 0;
var opening = new CirclePrimitive()
var opening = new EllipsePrimitive()
{
Diameter = 0.3d,
HeadMaterial = material,
Triangulate = triangOpening,
ClearUnderlying = true
DiameterByX = 0.3d
};
opening.DivisionSize.ClearUnderlying = true;
opening.NdmElement.HeadMaterial = material;
opening.NdmElement.Triangulate = triangOpening;
opening.VisualProperty.ZIndex = 1;
var primitives = new List<INdmPrimitive>() { mainBlock, opening };
var primitives = new List<INdmPrimitive>()
{
mainBlock,
opening
};
//Act
triangulateLogic = new TriangulatePrimitiveLogic()
{
@@ -137,18 +155,19 @@ namespace StructureHelperTests.UnitTests.Ndms.Triangulations
//Arrange
ProgramSetting.NatSystem = NatSystems.RU;
var material = HeadMaterialFactory.GetHeadMaterial(HeadmaterialType.Concrete40);
var mainBlock = new CirclePrimitive() { Diameter = diameter, HeadMaterial = material };
var mainBlock = new EllipsePrimitive() { DiameterByX = diameter};
mainBlock.NdmElement.HeadMaterial = material;
mainBlock.Center.X = centerX;
mainBlock.Center.Y = centerY;
mainBlock.VisualProperty.ZIndex = 0;
var opening = new RectanglePrimitive()
{
Width = 0.3d,
Height = 0.2d,
HeadMaterial = material,
Triangulate = triangOpening,
ClearUnderlying = true
Height = 0.2d
};
opening.DivisionSize.ClearUnderlying = true;
opening.NdmElement.HeadMaterial = material;
opening.NdmElement.Triangulate = triangOpening;
opening.VisualProperty.ZIndex = 1;
var primitives = new List<INdmPrimitive>() { mainBlock, opening };
//Act