lili/OCCT
1
0
Fork 0
mirror of https://github.com/Open-Cascade-SAS/OCCT.git synced 2026-09-06 04:37:55 +08:00
Code Issues Packages Projects Releases Wiki Activity

Foundation Classes, gp - Add constexpr/noexcept constructors and standard direction enums (#803)

Browse Source 
- Addition of `gp_Dir::D` and `gp_Dir2d::D` enums for standard directions (X, Y, Z, NX, NY, NZ)
- Constexpr/noexcept constructors for geometric primitives (circles, cones, cylinders, etc.)
- Enhanced axis placement classes with enum-based constructors
- Replacement of hardcoded direction values throughout the codebase
This commit is contained in:
Pasukhin Dmitry
2025-11-04 16:21:59 +00:00
committed by GitHub
parent 0763d96209
commit 2cc2bfdd27
203 changed files with 1169 additions and 793 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/ModelingAlgorithms/TKBO/BOPAlgo/BOPAlgo_WireSplitter_1.cxx
+1 -1
View File
@@ -833,7 +833,7 @@ Standard_Real Angle2D(const TopoDS_Vertex& aV,
Standard_Real Angle(const gp_Dir2d& aDir2D)
{
gp_Dir2d aRefDir(1., 0.);
gp_Dir2d aRefDir(gp_Dir2d::D::X);
Standard_Real anAngle;
anAngle = aRefDir.Angle(aDir2D);
src/ModelingAlgorithms/TKBO/BOPTools/BOPTools_AlgoTools3D.cxx
+2 -2
View File
@@ -144,7 +144,7 @@ Standard_Boolean BOPTools_AlgoTools3D::DoSplitSEAMOnFace(const TopoDS_Edge& aSpl
//
aT = BOPTools_AlgoTools2D::IntermediatePoint(a, b);
C2D1->D1(aT, aP2D, aVec2D);
gp_Dir2d aDir2D1(aVec2D), aDOX(-1., 0.), aDOY(0., 1.);
gp_Dir2d aDir2D1(aVec2D), aDOX(gp_Dir2d::D::NX), aDOY(gp_Dir2d::D::Y);
//
anU = aP2D.X();
anV = aP2D.Y();
@@ -892,7 +892,7 @@ Standard_Integer BOPTools_AlgoTools3D::PointInFace(const TopoDS_Face&
//
theContext->UVBounds(theF, aUMin, aUMax, aVMin, aVMax);
//
gp_Dir2d aD2D(0., 1.);
gp_Dir2d aD2D(gp_Dir2d::D::Y);
aUx = IntTools_Tools::IntermediatePoint(aUMin, aUMax);
//
for (i = 0; i < 2; ++i)
src/ModelingAlgorithms/TKBO/GTests/BOPTest_Utilities.pxx
+8 -5
View File
@@ -567,7 +567,7 @@ public:
const std::vector<ProfileOperation>& theOperations)
{
// Use default plane (XY plane)
const gp_Pln aPlane(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
const gp_Pln aPlane(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
return CreateProfile(aPlane, theOperations);
}
@@ -649,7 +649,8 @@ public:
static TopoDS_Shape RotateZ(const TopoDS_Shape& theShape, Standard_Real theAngleDeg)
{
gp_Trsf aRotation;
aRotation.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), theAngleDeg * M_PI / 180.0);
aRotation.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
theAngleDeg * M_PI / 180.0);
BRepBuilderAPI_Transform aTransform(theShape, aRotation);
return aTransform.Shape();
}
@@ -658,7 +659,8 @@ public:
static TopoDS_Shape RotateY(const TopoDS_Shape& theShape, Standard_Real theAngleDeg)
{
gp_Trsf aRotation;
aRotation.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), theAngleDeg * M_PI / 180.0);
aRotation.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Y)),
theAngleDeg * M_PI / 180.0);
BRepBuilderAPI_Transform aTransform(theShape, aRotation);
return aTransform.Shape();
}
@@ -667,7 +669,8 @@ public:
static TopoDS_Shape RotateX(const TopoDS_Shape& theShape, Standard_Real theAngleDeg)
{
gp_Trsf aRotation;
aRotation.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)), theAngleDeg * M_PI / 180.0);
aRotation.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::X)),
theAngleDeg * M_PI / 180.0);
BRepBuilderAPI_Transform aTransform(theShape, aRotation);
return aTransform.Shape();
}
@@ -695,7 +698,7 @@ public:
static TopoDS_Shape RotateY90(const TopoDS_Shape& theShape)
{
gp_Trsf aRotation;
aRotation.SetRotation(gp_Ax1(gp_Pnt(0, 0, 1), gp_Dir(0, 1, 0)), 90.0 * M_PI / 180.0);
aRotation.SetRotation(gp_Ax1(gp_Pnt(0, 0, 1), gp_Dir(gp_Dir::D::Y)), 90.0 * M_PI / 180.0);
BRepBuilderAPI_Transform aTransform(theShape, aRotation);
return aTransform.Shape();
}
src/ModelingAlgorithms/TKBO/GTests/BRepAlgoAPI_Cut_Test.cxx
+46 -46
View File
@@ -629,7 +629,7 @@ TEST_F(BCutSimpleTest, NurbsBoxMinusRotatedRectangularBox_F1)
constexpr Standard_Real r = M_SQRT2;
TopoDS_Shape aRectangularBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), r, r / 2.0, 1.0);
aRectangularBox = BOPTest_Utilities::RotateShape(aRectangularBox,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
45.0 * M_PI / 180.0);
const TopoDS_Shape aResult = PerformCut(aNurbsBox, aRectangularBox);
ValidateResult(aResult, 4.41421);
@@ -643,7 +643,7 @@ TEST_F(BCutSimpleTest, RotatedRectangularBoxMinusNurbsBox_F2)
constexpr Standard_Real r = M_SQRT2;
TopoDS_Shape aRectangularBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), r, r / 2.0, 1.0);
aRectangularBox = BOPTest_Utilities::RotateShape(aRectangularBox,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
45.0 * M_PI / 180.0);
const TopoDS_Shape aResult = PerformCut(aRectangularBox, aNurbsBox);
ValidateResult(aResult, 5.82843);
@@ -657,7 +657,7 @@ TEST_F(BCutSimpleTest, NurbsBoxMinusRotatedSquareBox_F3)
const Standard_Real r = sqrt(2.0) / 2.0;
TopoDS_Shape aSquareBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), r, r, 1.0);
aSquareBox = BOPTest_Utilities::RotateShape(aSquareBox,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
45.0 * M_PI / 180.0);
const TopoDS_Shape aResult = PerformCut(aNurbsBox, aSquareBox);
ValidateResult(aResult, 5.91421);
@@ -671,7 +671,7 @@ TEST_F(BCutSimpleTest, RotatedSquareBoxMinusNurbsBox_F4)
const Standard_Real r = sqrt(2.0) / 2.0;
TopoDS_Shape aSquareBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), r, r, 1.0);
aSquareBox = BOPTest_Utilities::RotateShape(aSquareBox,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
45.0 * M_PI / 180.0);
const TopoDS_Shape aResult = PerformCut(aSquareBox, aNurbsBox);
ValidateResult(aResult, 2.91421);
@@ -685,7 +685,7 @@ TEST_F(BCutSimpleTest, NurbsBoxMinusRotatedThinBox_F5)
constexpr Standard_Real r = M_SQRT2;
TopoDS_Shape aThinBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), r, 0.25, 1.0);
aThinBox = BOPTest_Utilities::RotateShape(aThinBox,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
45.0 * M_PI / 180.0);
const TopoDS_Shape aResult = PerformCut(aNurbsBox, aThinBox);
ValidateResult(aResult, 7.03921);
@@ -699,7 +699,7 @@ TEST_F(BCutSimpleTest, RotatedThinBoxMinusNurbsBox_F6)
constexpr Standard_Real r = M_SQRT2;
TopoDS_Shape aThinBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), r, 0.25, 1.0);
aThinBox = BOPTest_Utilities::RotateShape(aThinBox,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
45.0 * M_PI / 180.0);
const TopoDS_Shape aResult = PerformCut(aThinBox, aNurbsBox);
ValidateResult(aResult, 1.83211);
@@ -713,7 +713,7 @@ TEST_F(BCutSimpleTest, NurbsBoxMinusRotatedNarrowBox_F7)
constexpr Standard_Real r = 5.5677643628300219; // sqrt(31.0)
TopoDS_Shape aNarrowBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), r / 4.0, 0.25, 1.0);
aNarrowBox = BOPTest_Utilities::RotateShape(aNarrowBox,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
34.73 * M_PI / 180.0);
const TopoDS_Shape aResult = PerformCut(aNurbsBox, aNarrowBox);
ValidateResult(aResult, 7.21677);
@@ -727,7 +727,7 @@ TEST_F(BCutSimpleTest, RotatedNarrowBoxMinusNurbsBox_F8)
constexpr Standard_Real r = 5.5677643628300219;
TopoDS_Shape aNarrowBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), r / 4.0, 0.25, 1.0);
aNarrowBox = BOPTest_Utilities::RotateShape(aNarrowBox,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
34.73 * M_PI / 180.0);
const TopoDS_Shape aResult = PerformCut(aNarrowBox, aNurbsBox);
ValidateResult(aResult, 1.54631);
@@ -756,10 +756,10 @@ TEST_F(BCutSimpleTest, RotatedSphereMinusBox_G2)
{
TopoDS_Shape aSphere = BOPTest_Utilities::CreateSphere(gp_Pnt(0, 0, 0), 1.0);
aSphere = BOPTest_Utilities::RotateShape(aSphere,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
-90.0 * M_PI / 180.0);
aSphere = BOPTest_Utilities::RotateShape(aSphere,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Y)),
-45.0 * M_PI / 180.0);
const TopoDS_Shape aBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), 1.0, 1.0, 1.0);
const TopoDS_Shape aResult = PerformCut(aSphere, aBox);
@@ -771,10 +771,10 @@ TEST_F(BCutSimpleTest, BoxMinusRotatedSphere_G3)
{
TopoDS_Shape aSphere = BOPTest_Utilities::CreateSphere(gp_Pnt(0, 0, 0), 1.0);
aSphere = BOPTest_Utilities::RotateShape(aSphere,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
-90.0 * M_PI / 180.0);
aSphere = BOPTest_Utilities::RotateShape(aSphere,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Y)),
-45.0 * M_PI / 180.0);
const TopoDS_Shape aBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), 1.0, 1.0, 1.0);
const TopoDS_Shape aResult = PerformCut(aBox, aSphere);
@@ -787,7 +787,7 @@ TEST_F(BCutSimpleTest, SphereMinusRotatedBox_G4)
const TopoDS_Shape aSphere = BOPTest_Utilities::CreateSphere(gp_Pnt(0, 0, 0), 1.0);
TopoDS_Shape aBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), 1.0, 1.0, 1.0);
aBox = BOPTest_Utilities::RotateShape(aBox,
gp_Ax1(gp_Pnt(0, 0, 1), gp_Dir(0, 1, 0)),
gp_Ax1(gp_Pnt(0, 0, 1), gp_Dir(gp_Dir::D::Y)),
90.0 * M_PI / 180.0);
const TopoDS_Shape aResult = PerformCut(aSphere, aBox);
ValidateResult(aResult, 13.3517);
@@ -799,7 +799,7 @@ TEST_F(BCutSimpleTest, RotatedBoxMinusSphere_G5)
const TopoDS_Shape aSphere = BOPTest_Utilities::CreateSphere(gp_Pnt(0, 0, 0), 1.0);
TopoDS_Shape aBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), 1.0, 1.0, 1.0);
aBox = BOPTest_Utilities::RotateShape(aBox,
gp_Ax1(gp_Pnt(0, 0, 1), gp_Dir(0, 1, 0)),
gp_Ax1(gp_Pnt(0, 0, 1), gp_Dir(gp_Dir::D::Y)),
90.0 * M_PI / 180.0);
const TopoDS_Shape aResult = PerformCut(aBox, aSphere);
ValidateResult(aResult, 5.2146);
@@ -812,7 +812,7 @@ TEST_F(BCutSimpleTest, ComplexProfileRevolOperation_G6)
const TopoDS_Shape aBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), 100.0, 100.0, 40.0);
// Create exact G6 profile: "profile rev S b_4 F 50 20 Y 50 C 10 180 Y -50 C 10 180"
gp_Pln aPlane(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1)); // Face b_4 of box (top face at Z=40)
gp_Pln aPlane(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z)); // Face b_4 of box (top face at Z=40)
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::F, 50.0, 20.0), // F 50 20
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::Y, 50.0), // Y 50
@@ -825,7 +825,7 @@ TEST_F(BCutSimpleTest, ComplexProfileRevolOperation_G6)
// Create revolution: "revol rev2 rev 0 0 50 0 1 0 360" (around Y-axis at Z=50)
const TopoDS_Shape aRevolution =
BOPTest_Utilities::CreateRevolution(aProfile,
gp_Ax1(gp_Pnt(0, 0, 50), gp_Dir(0, 1, 0)),
gp_Ax1(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Y)),
2.0 * M_PI);
// Perform boolean cut operation: "bcut result b rev2"
@@ -964,7 +964,7 @@ TEST_F(BCutSimpleTest, ComplexCylinderConeOperationPro13307_H3)
TEST_F(BCutSimpleTest, ComplexProfileForwardForward_H4)
{
// Create profile p1: "profile p1 o 0 0 40 x 150 y 200 x -150"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -978,7 +978,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardForward_H4)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1022,7 +1022,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardForwardVariation_H5)
// H5 has same profiles as H4, but p3 has different sequence: "f 50 -75 y -100 x 75 y 100"
// Create profile p1: same as H4 "profile p1 o 0 0 40 x 150 y 200 x -150"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1036,7 +1036,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardForwardVariation_H5)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: same as H4 "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1076,7 +1076,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardForwardVariation_H5)
TEST_F(BCutSimpleTest, ComplexProfileForwardReversed_H6)
{
// Create profile p1: same as H4/H5 "profile p1 o 0 0 40 x 150 y 200 x -150"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1090,7 +1090,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardReversed_H6)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: same as H4/H5 "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1130,7 +1130,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardReversed_H6)
TEST_F(BCutSimpleTest, ComplexProfileForwardReversedVariation_H7)
{
// Create profile p1: same as other H tests "profile p1 o 0 0 40 x 150 y 200 x -150"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1144,7 +1144,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardReversedVariation_H7)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: same as other H tests "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1184,7 +1184,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardReversedVariation_H7)
TEST_F(BCutSimpleTest, ComplexProfileReversedForward_H8)
{
// Create profile p1: "profile p1 p 0 0 -1 1 0 0 o 0 0 40 y -200 x 150 y 200"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1)); // Use same approach as working H4/H5
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z)); // Use same approach as working H4/H5
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1198,7 +1198,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedForward_H8)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 x 75 y -100 x -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1238,7 +1238,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedForward_H8)
TEST_F(BCutSimpleTest, ComplexProfileReversedForwardVariation_H9)
{
// Create profile p1: same as H8 "profile p1 p 0 0 -1 1 0 0 o 0 0 40 y -200 x 150 y 200"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1252,7 +1252,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedForwardVariation_H9)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: same as H8 "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 x 75 y -100 x -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1292,7 +1292,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedForwardVariation_H9)
TEST_F(BCutSimpleTest, ComplexProfileReversedReversed_I1)
{
// Create profile p1: same as H8/H9 "profile p1 p 0 0 -1 1 0 0 o 0 0 40 y -200 x 150 y 200"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1307,7 +1307,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedReversed_I1)
// Create profile p2: same as H8/H9 "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 x 75 y -100 x
// -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1347,7 +1347,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedReversed_I1)
TEST_F(BCutSimpleTest, ComplexProfileReversedReversedVariation_I2)
{
// Create profile p1: same as I1 "profile p1 p 0 0 -1 1 0 0 o 0 0 40 y -200 x 150 y 200"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1361,7 +1361,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedReversedVariation_I2)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: same as I1 "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 x 75 y -100 x -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1401,7 +1401,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedReversedVariation_I2)
TEST_F(BCutSimpleTest, ComplexProfileForwardForwardVariation2_I3)
{
// Create profile p1: "profile p1 o 0 0 40 f 0 50 x 150 y 100 x -150"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1417,7 +1417,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardForwardVariation2_I3)
// Create profile p2: same as I1/I2 but different plane "profile p2 o 0 0 50 f 25 25 y 100 x 75 y
// -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1457,7 +1457,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardForwardVariation2_I3)
TEST_F(BCutSimpleTest, ComplexProfileForwardForwardVariation3_I4)
{
// Create profile p1: same as I3 "profile p1 o 0 0 40 f 0 50 x 150 y 100 x -150"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1472,7 +1472,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardForwardVariation3_I4)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: same as I3 "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1514,7 +1514,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardForwardVariation3_I4)
TEST_F(BCutSimpleTest, ComplexProfileForwardReversedVariation2_I5)
{
// Create profile p1: same as I3/I4 "profile p1 o 0 0 40 f 0 50 x 150 y 100 x -150"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1529,7 +1529,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardReversedVariation2_I5)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: same as I3/I4 "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1569,7 +1569,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardReversedVariation2_I5)
TEST_F(BCutSimpleTest, ComplexProfileForwardReversedVariation3_I6)
{
// Same profiles as I5 but different p3 - "profile p3 o 0 0 50 f 50 75 y 100 x 75 y -100"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O, 0.0, 0.0, 40.0),
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::F, 0.0, 50.0),
@@ -1579,7 +1579,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardReversedVariation3_I6)
const TopoDS_Shape aProfile1 = BOPTest_Utilities::CreateProfile(aPlane1, aProfileOps1);
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O, 0.0, 0.0, 50.0),
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::F, 25.0, 25.0),
@@ -1610,7 +1610,7 @@ TEST_F(BCutSimpleTest, ComplexProfileForwardReversedVariation3_I6)
TEST_F(BCutSimpleTest, ComplexProfileReversedForwardVariation2_I7)
{
// Create profile p1: "profile p1 p 0 0 -1 1 0 0 o 0 0 40 f 0 -50 y -100 x 150 y 100"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1625,7 +1625,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedForwardVariation2_I7)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 x 75 y -100 x -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1665,7 +1665,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedForwardVariation2_I7)
TEST_F(BCutSimpleTest, ComplexProfileReversedForwardVariation3_I8)
{
// Create profile p1: "profile p1 p 0 0 -1 1 0 0 o 0 0 40 f 0 -50 y -100 x 150 y 100"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1680,7 +1680,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedForwardVariation3_I8)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 x 75 y -100 x -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1720,7 +1720,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedForwardVariation3_I8)
TEST_F(BCutSimpleTest, ComplexProfileReversedReversedVariation2_I9)
{
// Create profile p1: "profile p1 p 0 0 -1 1 0 0 o 0 0 40 f 0 -50 y -100 x 150 y 100"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1735,7 +1735,7 @@ TEST_F(BCutSimpleTest, ComplexProfileReversedReversedVariation2_I9)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 x 75 y -100 x -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
src/ModelingAlgorithms/TKBO/GTests/BRepAlgoAPI_Cut_Test_1.cxx
+39 -39
View File
@@ -26,7 +26,7 @@ class BCutSimpleTest1 : public BRepAlgoAPI_TestBase
TEST_F(BCutSimpleTest1, ComplexProfileReversedReversedVariation3_J1)
{
// Create profile p1: "profile p1 p 0 0 -1 1 0 0 o 0 0 40 f 0 -50 y -100 x 150 y 100"
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 40), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -41,7 +41,7 @@ TEST_F(BCutSimpleTest1, ComplexProfileReversedReversedVariation3_J1)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 x 75 y -100 x -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -120,7 +120,7 @@ TEST_F(BCutSimpleTest1, ComplexProfileWithTranslationForwardReversedForward_J3)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 175, 250, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 75 x 50 y -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -204,7 +204,7 @@ TEST_F(BCutSimpleTest1, ComplexProfileReversedReversedForward_J4)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 175, 250, -40);
// Create profile p2: "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 y -75 x 50 y 75"
gp_Pln aPlane2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::P,
0.0,
@@ -292,7 +292,7 @@ TEST_F(BCutSimpleTest1, ComplexProfileForwardForwardForwardVariation_J5)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 175, 250, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 75 x 50 y -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -359,7 +359,7 @@ TEST_F(BCutSimpleTest1, ComplexProfileForwardReversedForwardVariation_J6)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 175, 250, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 75 x 50 y -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -426,7 +426,7 @@ TEST_F(BCutSimpleTest1, ComplexProfileReversedReversedForwardVariation_J7)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 175, 250, -40);
// Create profile p2: "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 y -75 x 50 y 75"
gp_Pln aPlane2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::P,
0.0,
@@ -500,7 +500,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardForward_J8)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 150, 200, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -520,7 +520,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardForward_J8)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 o 0 0 -10 f 50 75 y 100 x 75 y -100"
gp_Pln aPlane3(gp_Pnt(0, 0, -10), gp_Dir(0, 0, 1));
gp_Pln aPlane3(gp_Pnt(0, 0, -10), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -547,7 +547,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardForwardWithReversed_J9)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 150, 200, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -567,7 +567,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardForwardWithReversed_J9)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 o 0 0 -10 f 50 75 x 75 y 100 x -75"
gp_Pln aPlane3(gp_Pnt(0, 0, -10), gp_Dir(0, 0, 1));
gp_Pln aPlane3(gp_Pnt(0, 0, -10), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -594,7 +594,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardReversed_K1)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 150, 200, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -614,7 +614,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardReversed_K1)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 p 0 0 -1 1 0 0 o 0 0 -10 f 50 -75 y -100 x 75 y 100"
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(1, 0, 0));
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(gp_Dir::D::X));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -641,7 +641,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardObjectReversedTool_K2)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 150, 200, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -661,7 +661,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardObjectReversedTool_K2)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 p 0 0 -1 1 0 0 o 0 0 -10 f 50 -75 x 75 y -100 x -75"
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(1, 0, 0));
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(gp_Dir::D::X));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -684,7 +684,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardObjectReversedTool_K2)
TEST_F(BCutSimpleTest1, SameOrientedProfileReversedObjectForwardTool_K3)
{
// Create profile p1: "profile p1 p 0 0 -1 1 0 0 o 0 0 40 y -200 x 150 y 200"
gp_Pln aPlane1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::P,
0.0,
@@ -705,7 +705,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileReversedObjectForwardTool_K3)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 x 75 y -100 x -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::P,
0.0,
@@ -732,7 +732,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileReversedObjectForwardTool_K3)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 o 0 0 -10 f 50 75 y 100 x 75 y -100"
gp_Pln aPlane3(gp_Pnt(0, 0, -10), gp_Dir(0, 0, 1));
gp_Pln aPlane3(gp_Pnt(0, 0, -10), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -755,7 +755,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileReversedObjectForwardTool_K3)
TEST_F(BCutSimpleTest1, SameOrientedProfileReversedObjectReversedTool_K4)
{
// Create profile p1: "profile p1 p 0 0 -1 1 0 0 o 0 0 40 y -200 x 150 y 200"
gp_Pln aPlane1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::P,
0.0,
@@ -776,7 +776,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileReversedObjectReversedTool_K4)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, -40));
// Create profile p2: "profile p2 p 0 0 -1 1 0 0 o 0 0 50 f 25 -25 x 75 y -100 x -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::P,
0.0,
@@ -803,7 +803,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileReversedObjectReversedTool_K4)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 o 0 0 -10 f 50 75 x 75 y 100 x -75"
gp_Pln aPlane3(gp_Pnt(0, 0, -10), gp_Dir(0, 0, 1));
gp_Pln aPlane3(gp_Pnt(0, 0, -10), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -830,7 +830,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardReversedRepeated_K5)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 150, 200, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -850,7 +850,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardReversedRepeated_K5)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 p 0 0 -1 1 0 0 o 0 0 -10 f 50 -75 y -100 x 75 y 100"
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(1, 0, 0));
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(gp_Dir::D::X));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -877,7 +877,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardObjectReversedToolVar_K6)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 150, 200, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -897,7 +897,7 @@ TEST_F(BCutSimpleTest1, SameOrientedProfileForwardObjectReversedToolVar_K6)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 p 0 0 -1 1 0 0 o 0 0 -10 f 50 -75 x 75 y -100 x -75"
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(1, 0, 0));
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(gp_Dir::D::X));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -924,7 +924,7 @@ TEST_F(BCutSimpleTest1, ComplexMultiStepProfileAllForward_K7)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 175, 250, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 75 x 50 y -75"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -944,7 +944,7 @@ TEST_F(BCutSimpleTest1, ComplexMultiStepProfileAllForward_K7)
const TopoDS_Shape aIntermediate1 = aCutOp1.Shape();
// Create profile p3: "profile p3 p 0 0 -1 1 0 0 o 0 0 20 f 100 -150 y -75 x 50 y 75"
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(1, 0, 0));
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(gp_Dir::D::X));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -966,7 +966,7 @@ TEST_F(BCutSimpleTest1, ComplexMultiStepProfileAllForward_K7)
const TopoDS_Shape aIntermediate2 = aCutOp2.Shape();
// Create profile p4: "profile p4 o 0 0 25 f 50 75 x 75 y 100 x -75"
gp_Pln aPlane4(gp_Pnt(0, 0, 25), gp_Dir(0, 0, 1));
gp_Pln aPlane4(gp_Pnt(0, 0, 25), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps4 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -993,7 +993,7 @@ TEST_F(BCutSimpleTest1, DiffOrientedProfileAllForward_K8)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 150, 200, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1013,7 +1013,7 @@ TEST_F(BCutSimpleTest1, DiffOrientedProfileAllForward_K8)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 p 0 0 -1 1 0 0 o 0 0 50 f 50 -125 x 75 y -50 x -75"
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(1, 0, 0));
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(gp_Dir::D::X));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1042,7 +1042,7 @@ TEST_F(BCutSimpleTest1, DiffOrientedProfileAllForwardVar_K9)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 150, 200, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1062,7 +1062,7 @@ TEST_F(BCutSimpleTest1, DiffOrientedProfileAllForwardVar_K9)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 p 0 0 -1 1 0 0 o 0 0 50 f 25 -125 x 50 y -50 x -50"
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(1, 0, 0));
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(gp_Dir::D::X));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1091,7 +1091,7 @@ TEST_F(BCutSimpleTest1, DiffOrientedProfileAllForward_L1)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 150, 200, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1111,7 +1111,7 @@ TEST_F(BCutSimpleTest1, DiffOrientedProfileAllForward_L1)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 p 0 0 -1 1 0 0 o 0 0 50 f 50 25 x 25 y -280 x -25"
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(1, 0, 0));
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(gp_Dir::D::X));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1138,7 +1138,7 @@ TEST_F(BCutSimpleTest1, DiffOrientedProfileForwardObjectReversedTool_L2)
BOPTest_Utilities::CreateRectangularPrism(gp_Pnt(0, 0, 40), 150, 200, -40);
// Create profile p2: "profile p2 o 0 0 50 f 25 25 y 100 x 75 y -100"
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 50), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1158,7 +1158,7 @@ TEST_F(BCutSimpleTest1, DiffOrientedProfileForwardObjectReversedTool_L2)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile p3: "profile p3 o 0 0 20 f 50 255 y -280 x 25 y 280"
gp_Pln aPlane3(gp_Pnt(0, 0, 20), gp_Dir(0, 0, 1));
gp_Pln aPlane3(gp_Pnt(0, 0, 20), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1181,7 +1181,7 @@ TEST_F(BCutSimpleTest1, DiffOrientedProfileForwardObjectReversedTool_L2)
TEST_F(BCutSimpleTest1, RolexCaseForwardForward_L3)
{
// Create profile f1: "profile f1 c 60 360"
gp_Pln aPlane1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Pln aPlane1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::C, 60.0, 360.0) // c 60 360
};
@@ -1189,7 +1189,7 @@ TEST_F(BCutSimpleTest1, RolexCaseForwardForward_L3)
const TopoDS_Shape aPrism1 = BOPTest_Utilities::CreatePrism(aProfile1, gp_Vec(0, 0, 20));
// Create profile f2: "profile f2 o 0 0 20 f 10 -20 c 40 360"
gp_Pln aPlane2(gp_Pnt(0, 0, 20), gp_Dir(0, 0, 1));
gp_Pln aPlane2(gp_Pnt(0, 0, 20), gp_Dir(gp_Dir::D::Z));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
@@ -1207,7 +1207,7 @@ TEST_F(BCutSimpleTest1, RolexCaseForwardForward_L3)
const TopoDS_Shape aIntermediate = aCutOp1.Shape();
// Create profile f3: "profile f3 p 0 0 -1 1 0 0 o 0 0 23 f 50 -10 c -30 360"
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(1, 0, 0));
gp_Pln aPlane3(gp_Pnt(0, 0, -1), gp_Dir(gp_Dir::D::X));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps3 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::O,
0.0,
src/ModelingAlgorithms/TKBO/GTests/BRepAlgoAPI_Fuse_Test.cxx
+25 -25
View File
@@ -387,7 +387,7 @@ TEST_F(BFuseSimpleTest, NurbsBoxPlusRotatedNarrowBox_D1)
constexpr Standard_Real r = M_SQRT2;
TopoDS_Shape aBox2 = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), r, 0.25, 1.0);
gp_Trsf aTrsf;
aTrsf.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), M_PI / 4.0); // 45 degrees
aTrsf.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)), M_PI / 4.0); // 45 degrees
aBox2.Move(aTrsf);
const TopoDS_Shape aResult = PerformFuse(aBox2, aBox1);
@@ -404,7 +404,7 @@ TEST_F(BFuseSimpleTest, NurbsBoxPlusRotatedNarrowBoxVariation_D2)
constexpr Standard_Real r = 5.5677643628300219;
TopoDS_Shape aBox2 = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), r / 4.0, 0.25, 1.0);
gp_Trsf aTrsf;
aTrsf.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), 34.73 * M_PI / 180.0);
aTrsf.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)), 34.73 * M_PI / 180.0);
aBox2.Move(aTrsf);
const TopoDS_Shape aResult = PerformFuse(aBox2, aBox1);
@@ -438,8 +438,8 @@ TEST_F(BFuseSimpleTest, RotatedSpherePlusBox_D5)
// Apply rotations: -90 degrees around Z, then -45 degrees around Y
gp_Trsf aTrsf1, aTrsf2, aTrsfCombined;
aTrsf1.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), -M_PI / 2.0); // -90 degrees Z
aTrsf2.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), -M_PI / 4.0); // -45 degrees Y
aTrsf1.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)), -M_PI / 2.0); // -90 degrees Z
aTrsf2.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Y)), -M_PI / 4.0); // -45 degrees Y
aTrsfCombined = aTrsf2 * aTrsf1;
aSphere.Move(aTrsfCombined);
@@ -455,8 +455,8 @@ TEST_F(BFuseSimpleTest, BoxPlusRotatedSphere_D6)
// Apply rotations: -90 degrees around Z, then -45 degrees around Y
gp_Trsf aTrsf1, aTrsf2, aTrsfCombined;
aTrsf1.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)), -M_PI / 2.0);
aTrsf2.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 1, 0)), -M_PI / 4.0);
aTrsf1.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)), -M_PI / 2.0);
aTrsf2.SetRotation(gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Y)), -M_PI / 4.0);
aTrsfCombined = aTrsf2 * aTrsf1;
aSphere.Move(aTrsfCombined);
@@ -473,7 +473,7 @@ TEST_F(BFuseSimpleTest, SpherePlusRotatedBox_D7)
TopoDS_Shape aBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), 1.0, 1.0, 1.0);
// Rotate box 90 degrees around Y axis: "trotate b 0 0 1 0 1 0 90"
gp_Trsf aTrsf;
aTrsf.SetRotation(gp_Ax1(gp_Pnt(0, 0, 1), gp_Dir(0, 1, 0)), M_PI / 2.0); // 90 degrees Y
aTrsf.SetRotation(gp_Ax1(gp_Pnt(0, 0, 1), gp_Dir(gp_Dir::D::Y)), M_PI / 2.0); // 90 degrees Y
aBox.Move(aTrsf);
const TopoDS_Shape aResult = PerformFuse(aSphere, aBox);
@@ -488,7 +488,7 @@ TEST_F(BFuseSimpleTest, RotatedBoxPlusSphere_D8)
TopoDS_Shape aBox = BOPTest_Utilities::CreateBox(gp_Pnt(0, 0, 0), 1.0, 1.0, 1.0);
// Rotate box 90 degrees around Y axis: "trotate b 0 0 1 0 1 0 90"
gp_Trsf aTrsf;
aTrsf.SetRotation(gp_Ax1(gp_Pnt(0, 0, 1), gp_Dir(0, 1, 0)), M_PI / 2.0); // 90 degrees Y
aTrsf.SetRotation(gp_Ax1(gp_Pnt(0, 0, 1), gp_Dir(gp_Dir::D::Y)), M_PI / 2.0); // 90 degrees Y
aBox.Move(aTrsf);
const TopoDS_Shape aResult = PerformFuse(aBox, aSphere);
@@ -500,7 +500,7 @@ TEST_F(BFuseSimpleTest, ProfileBasedPrisms_D9)
{
// Create first profile: "profile f1 x 100 y 100 x -200 y -200 x 100"
// This creates a closed rectangular profile starting at origin
gp_Pln aPlane1(gp_Ax3(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)));
gp_Pln aPlane1(gp_Ax3(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::X,
100.0), // move to (100, 0)
@@ -518,7 +518,7 @@ TEST_F(BFuseSimpleTest, ProfileBasedPrisms_D9)
// Create second profile: "profile f2 x -100 y 100 x 100; ttranslate f2 0 0 100"
// This creates a triangular profile translated to z=100
gp_Pln aPlane2(gp_Ax3(gp_Pnt(0, 0, 100), gp_Dir(0, 0, 1)));
gp_Pln aPlane2(gp_Ax3(gp_Pnt(0, 0, 100), gp_Dir(gp_Dir::D::Z)));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::X,
-100.0), // move to (-100, 0)
@@ -540,7 +540,7 @@ TEST_F(BFuseSimpleTest, ComplexProfileWithScaling_E1)
const Standard_Real SCALE = 100.0;
// Create first profile: "profile f1 c 50*SCALE 180 x -100*SCALE c 50*SCALE 180"
gp_Pln aPlane1(gp_Ax3(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)));
gp_Pln aPlane1(gp_Ax3(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps1 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::C, 50.0 * SCALE, 180.0),
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::X, -100.0 * SCALE),
@@ -551,7 +551,7 @@ TEST_F(BFuseSimpleTest, ComplexProfileWithScaling_E1)
// Create second profile: "profile f2 x 300*SCALE y 200*SCALE x -300*SCALE; ttranslate f2
// -200*SCALE -50*SCALE 0"
gp_Pln aPlane2(gp_Ax3(gp_Pnt(-200.0 * SCALE, -50.0 * SCALE, 0), gp_Dir(0, 0, 1)));
gp_Pln aPlane2(gp_Ax3(gp_Pnt(-200.0 * SCALE, -50.0 * SCALE, 0), gp_Dir(gp_Dir::D::Z)));
std::vector<BOPTest_Utilities::ProfileOperation> aProfileOps2 = {
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::X, 300.0 * SCALE),
BOPTest_Utilities::ProfileOperation(BOPTest_Utilities::ProfileCmd::Y, 200.0 * SCALE),
@@ -595,7 +595,7 @@ TEST_F(BFuseSimpleTest, ComplexVertexEdgeWireRevolution_E3)
// Create revolution: "revol cyla pa 0 0 0 0 0 1 360"
const TopoDS_Shape aRevolution =
BOPTest_Utilities::CreateRevolution(aFace,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
2.0 * M_PI);
// Create cylinder: "pcylinder cylb 1 9; ttranslate cylb 5 0 -2"
@@ -627,7 +627,7 @@ TEST_F(BFuseSimpleTest, CylinderWithComplexWireRevolution_E4)
// Create revolution: "revol ring f 0 0 0 0 0 1 269"
const TopoDS_Shape aRing =
BOPTest_Utilities::CreateRevolution(aFace,
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1)),
gp_Ax1(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z)),
269.0 * M_PI / 180.0);
const TopoDS_Shape aResult = PerformFuse(aCylinder, aRing);
@@ -1844,7 +1844,7 @@ TEST_F(BFuseSimpleTest, CylinderWithRevolutionRing_J9)
const TopoDS_Shape aRingFace = BOPTest_Utilities::CreateFaceFromWire(aRingWire);
// Create revolution: revol ring f 0 0 0 0 0 1 269
const gp_Ax1 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
const gp_Ax1 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
const TopoDS_Shape aRing =
BOPTest_Utilities::CreateRevolution(aRingFace, aAxis, 269.0 * M_PI / 180.0);
@@ -1868,11 +1868,11 @@ TEST_F(BFuseSimpleTest, ComplexProfileWithRevolution_K1)
{BOPTest_Utilities::ProfileCmd::Y, -25},
{BOPTest_Utilities::ProfileCmd::X, -60},
{BOPTest_Utilities::ProfileCmd::W, {}}};
const gp_Pln aPlane(gp_Pnt(0, 0, 0), gp_Dir(1, 0, 0)); // pl 1 0 0 0 0 1 (normal 1,0,0)
const gp_Pln aPlane(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::X)); // pl 1 0 0 0 0 1 (normal 1,0,0)
const TopoDS_Shape aProfile = BOPTest_Utilities::CreateProfile(aPlane, aOps);
// Create revolution: revol rv wr 50 100 50 0 0 1 360
const gp_Ax1 aRevAxis(gp_Pnt(50, 100, 50), gp_Dir(0, 0, 1));
const gp_Ax1 aRevAxis(gp_Pnt(50, 100, 50), gp_Dir(gp_Dir::D::Z));
const TopoDS_Shape aRevolution =
BOPTest_Utilities::CreateRevolution(aProfile, aRevAxis, 2 * M_PI);
@@ -1893,7 +1893,7 @@ TEST_F(BFuseSimpleTest, BlendBoxWithCylinder_K2)
const TopoDS_Shape aCylinder = BOPTest_Utilities::CreateCylinder(100.0, 50.0);
// Create plane and cylinder: plane pl1 100 100 100 0 0 1 1 0 0, pcylinder pc pl1 100 50
// const gp_Ax3 anAx3(gp_Pnt(100, 100, 100), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0));
// const gp_Ax3 anAx3(gp_Pnt(100, 100, 100), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X));
// const gp_Pln aPlane(anAx3);
// const TopoDS_Shape aCylinder = BOPTest_Utilities::CreateCylinderOnPlane(aPlane, 100.0, 50.0);
@@ -1912,7 +1912,7 @@ TEST_F(BFuseSimpleTest, BlendBoxWithCylinderNegX_K3)
EXPECT_FALSE(aBlendedBox.IsNull()) << "Blend operation failed";
// Create plane and cylinder: plane pl1 100 100 100 0 0 1 -1 0 0, pcylinder pc pl1 100 50
const gp_Ax3 anAx3(gp_Pnt(100, 100, 100), gp_Dir(0, 0, 1), gp_Dir(-1, 0, 0));
const gp_Ax3 anAx3(gp_Pnt(100, 100, 100), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::NX));
const gp_Pln aPlane(anAx3);
const TopoDS_Shape aCylinder = BOPTest_Utilities::CreateCylinderOnPlane(aPlane, 100.0, 50.0);
EXPECT_FALSE(aCylinder.IsNull()) << "Cylinder creation failed";
@@ -1931,7 +1931,7 @@ TEST_F(BFuseSimpleTest, BlendBoxWithCylinderY_K4)
const TopoDS_Shape aBlendedBox = BOPTest_Utilities::CreateBlend(aBox, 1, 100.0);
// Create plane and cylinder: plane pl1 100 100 100 0 0 1 0 1 0, pcylinder pc pl1 100 50
const gp_Ax3 anAx3(gp_Pnt(100, 100, 100), gp_Dir(0, 0, 1), gp_Dir(0, 1, 0));
const gp_Ax3 anAx3(gp_Pnt(100, 100, 100), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::Y));
const gp_Pln aPlane(anAx3);
const TopoDS_Shape aCylinder = BOPTest_Utilities::CreateCylinderOnPlane(aPlane, 100.0, 50.0);
@@ -1949,7 +1949,7 @@ TEST_F(BFuseSimpleTest, BlendBoxWithCylinderNegY_K5)
const TopoDS_Shape aBlendedBox = BOPTest_Utilities::CreateBlend(aBox, 1, 100.0);
// Create plane and cylinder: plane pl1 100 100 100 0 0 1 0 -1 0, pcylinder pc pl1 100 50
const gp_Ax3 anAx3(gp_Pnt(100, 100, 100), gp_Dir(0, 0, 1), gp_Dir(0, -1, 0));
const gp_Ax3 anAx3(gp_Pnt(100, 100, 100), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::NY));
const gp_Pln aPlane(anAx3);
const TopoDS_Shape aCylinder = BOPTest_Utilities::CreateCylinderOnPlane(aPlane, 100.0, 50.0);
@@ -1967,7 +1967,7 @@ TEST_F(BFuseSimpleTest, BlendBoxWithCylinderBottomX_K6)
const TopoDS_Shape aBlendedBox = BOPTest_Utilities::CreateBlend(aBox, 1, 100.0);
// Create plane and cylinder: plane pl1 100 100 0 0 0 -1 1 0 0, pcylinder pc pl1 100 50
const gp_Ax3 anAx3(gp_Pnt(100, 100, 0), gp_Dir(0, 0, -1), gp_Dir(1, 0, 0));
const gp_Ax3 anAx3(gp_Pnt(100, 100, 0), gp_Dir(gp_Dir::D::NZ), gp_Dir(gp_Dir::D::X));
const gp_Pln aPlane(anAx3);
const TopoDS_Shape aCylinder = BOPTest_Utilities::CreateCylinderOnPlane(aPlane, 100.0, 50.0);
@@ -1985,7 +1985,7 @@ TEST_F(BFuseSimpleTest, BlendBoxWithCylinderBottomNegX_K7)
const TopoDS_Shape aBlendedBox = BOPTest_Utilities::CreateBlend(aBox, 1, 100.0);
// Create plane and cylinder: plane pl1 100 100 0 0 0 -1 -1 0 0, pcylinder pc pl1 100 50
const gp_Ax3 anAx3(gp_Pnt(100, 100, 0), gp_Dir(0, 0, -1), gp_Dir(-1, 0, 0));
const gp_Ax3 anAx3(gp_Pnt(100, 100, 0), gp_Dir(gp_Dir::D::NZ), gp_Dir(gp_Dir::D::NX));
const gp_Pln aPlane(anAx3);
const TopoDS_Shape aCylinder = BOPTest_Utilities::CreateCylinderOnPlane(aPlane, 100.0, 50.0);
@@ -2003,7 +2003,7 @@ TEST_F(BFuseSimpleTest, BlendBoxWithCylinderBottomY_K8)
const TopoDS_Shape aBlendedBox = BOPTest_Utilities::CreateBlend(aBox, 1, 100.0);
// Create plane and cylinder: plane pl1 100 100 0 0 0 -1 0 1 0, pcylinder pc pl1 100 50
const gp_Ax3 anAx3(gp_Pnt(100, 100, 0), gp_Dir(0, 0, -1), gp_Dir(0, 1, 0));
const gp_Ax3 anAx3(gp_Pnt(100, 100, 0), gp_Dir(gp_Dir::D::NZ), gp_Dir(gp_Dir::D::Y));
const gp_Pln aPlane(anAx3);
const TopoDS_Shape aCylinder = BOPTest_Utilities::CreateCylinderOnPlane(aPlane, 100.0, 50.0);
@@ -2021,7 +2021,7 @@ TEST_F(BFuseSimpleTest, BlendBoxWithCylinderBottomNegY_K9)
const TopoDS_Shape aBlendedBox = BOPTest_Utilities::CreateBlend(aBox, 1, 100.0);
// Create plane and cylinder: plane pl1 100 100 0 0 0 -1 0 -1 0, pcylinder pc pl1 100 50
const gp_Ax3 anAx3(gp_Pnt(100, 100, 0), gp_Dir(0, 0, -1), gp_Dir(0, -1, 0));
const gp_Ax3 anAx3(gp_Pnt(100, 100, 0), gp_Dir(gp_Dir::D::NZ), gp_Dir(gp_Dir::D::NY));
const gp_Pln aPlane(anAx3);
const TopoDS_Shape aCylinder = BOPTest_Utilities::CreateCylinderOnPlane(aPlane, 100.0, 50.0);
src/ModelingAlgorithms/TKBO/IntTools/IntTools_FaceFace.cxx
+2 -2
View File
@@ -2121,8 +2121,8 @@ void CorrectSurfaceBoundaries(const TopoDS_Face& theFace,
correct = Standard_False;
break;
}
gp_Dir2d anUDir(1., 0.);
gp_Dir2d aVDir(0., 1.);
gp_Dir2d anUDir(gp_Dir2d::D::X);
gp_Dir2d aVDir(gp_Dir2d::D::Y);
Standard_Real anAngularTolerance = Precision::Angular();
correctU =
src/ModelingAlgorithms/TKBool/BRepFill/BRepFill.cxx
+16 -16
View File
@@ -367,38 +367,38 @@ TopoDS_Face BRepFill::Face(const TopoDS_Edge& Edge1, const TopoDS_Edge& Edge2)
if (Edge1.Orientation() == TopAbs_REVERSED)
{
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(-1, 0)), Face, T);
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(gp_Dir2d::D::NX)), Face, T);
B.Range(Edge1, Face, -l1, -f1);
}
else
{
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(1, 0)), Face, T);
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(gp_Dir2d::D::X)), Face, T);
B.Range(Edge1, Face, f1, l1);
}
if (Edge2.Orientation() == TopAbs_REVERSED)
{
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(-1, 0)), Face, T);
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(gp_Dir2d::D::NX)), Face, T);
B.Range(Edge2, Face, -l1, -f1);
}
else
{
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(1, 0)), Face, T);
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(gp_Dir2d::D::X)), Face, T);
B.Range(Edge2, Face, f1, l1);
}
if (Closed)
{
B.UpdateEdge(Edge3,
new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(0, 1)),
new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(0, 1)),
new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(gp_Dir2d::D::Y)),
new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(gp_Dir2d::D::Y)),
Face,
T);
}
else
{
B.UpdateEdge(Edge3, new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(0, 1)), Face, T);
B.UpdateEdge(Edge4, new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(0, 1)), Face, T);
B.UpdateEdge(Edge3, new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(gp_Dir2d::D::Y)), Face, T);
B.UpdateEdge(Edge4, new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(gp_Dir2d::D::Y)), Face, T);
}
// Set the non parameter flag;
@@ -608,38 +608,38 @@ TopoDS_Shell BRepFill::Shell(const TopoDS_Wire& Wire1, const TopoDS_Wire& Wire2)
if (Edge1.Orientation() == TopAbs_REVERSED)
{
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(-1, 0)), Face, T);
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(gp_Dir2d::D::NX)), Face, T);
B.Range(Edge1, Face, -l1, -f1);
}
else
{
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(1, 0)), Face, T);
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(gp_Dir2d::D::X)), Face, T);
B.Range(Edge1, Face, f1, l1);
}
if (Edge2.Orientation() == TopAbs_REVERSED)
{
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(-1, 0)), Face, T);
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(gp_Dir2d::D::NX)), Face, T);
B.Range(Edge2, Face, -l1, -f1);
}
else
{
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(1, 0)), Face, T);
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(gp_Dir2d::D::X)), Face, T);
B.Range(Edge2, Face, f1, l1);
}
if (Periodic)
{
B.UpdateEdge(Edge3,
new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(0, 1)),
new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(0, 1)),
new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(gp_Dir2d::D::Y)),
new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(gp_Dir2d::D::Y)),
Face,
T);
}
else
{
B.UpdateEdge(Edge3, new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(0, 1)), Face, T);
B.UpdateEdge(Edge4, new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(0, 1)), Face, T);
B.UpdateEdge(Edge3, new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(gp_Dir2d::D::Y)), Face, T);
B.UpdateEdge(Edge4, new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(gp_Dir2d::D::Y)), Face, T);
}
// Set the non parameter flag;
src/ModelingAlgorithms/TKBool/BRepFill/BRepFill_Evolved.cxx
+2 -2
View File
@@ -682,7 +682,7 @@ void BRepFill_Evolved::ElementaryPerform(const TopoDS_Face& Sp,
TColStd_SequenceOfReal EmptySeqOfReal;
// mark of the profile.
gp_Ax3 AxeRef(gp_Pnt(0., 0., 0.), gp_Dir(0., 0., 1.), gp_Dir(1., 0., 0.));
gp_Ax3 AxeRef(gp_Pnt(0., 0., 0.), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X));
//---------------------------------------------------------------
// Construction of revolutions and tubes.
@@ -2446,7 +2446,7 @@ TopLoc_Location BRepFill_Evolved::FindLocation(const TopoDS_Face& Face) const
gp_Ax3 Axis = P->Position();
gp_Trsf T;
gp_Ax3 AxeRef(gp_Pnt(0., 0., 0.), gp_Dir(0., 0., 1.), gp_Dir(1., 0., 0.));
gp_Ax3 AxeRef(gp_Pnt(0., 0., 0.), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X));
T.SetTransformation(AxeRef, Axis);
return TopLoc_Location(T);
src/ModelingAlgorithms/TKBool/BRepFill/BRepFill_Generator.cxx
+8 -8
View File
@@ -983,23 +983,23 @@ void BRepFill_Generator::Perform()
{
if (Edge1.Orientation() == TopAbs_REVERSED)
{
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(-1, 0)), Face, T);
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(gp_Dir2d::D::NX)), Face, T);
B.Range(Edge1, Face, -l1, -f1);
}
else
{
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(1, 0)), Face, T);
B.UpdateEdge(Edge1, new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(gp_Dir2d::D::X)), Face, T);
B.Range(Edge1, Face, f1, l1);
}
if (Edge2.Orientation() == TopAbs_REVERSED)
{
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(-1, 0)), Face, T);
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(gp_Dir2d::D::NX)), Face, T);
B.Range(Edge2, Face, -l1, -f1);
}
else
{
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(1, 0)), Face, T);
B.UpdateEdge(Edge2, new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(gp_Dir2d::D::X)), Face, T);
B.Range(Edge2, Face, f1, l1);
}
}
@@ -1009,15 +1009,15 @@ void BRepFill_Generator::Perform()
if (Periodic)
{
B.UpdateEdge(Edge3,
new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(0, 1)),
new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(0, 1)),
new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(gp_Dir2d::D::Y)),
new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(gp_Dir2d::D::Y)),
Face,
T);
}
else
{
B.UpdateEdge(Edge3, new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(0, 1)), Face, T);
B.UpdateEdge(Edge4, new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(0, 1)), Face, T);
B.UpdateEdge(Edge3, new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(gp_Dir2d::D::Y)), Face, T);
B.UpdateEdge(Edge4, new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(gp_Dir2d::D::Y)), Face, T);
}
}
else
src/ModelingAlgorithms/TKBool/BRepFill/BRepFill_ShapeLaw.cxx
+1 -1
View File
@@ -63,7 +63,7 @@ BRepFill_ShapeLaw::BRepFill_ShapeLaw(const TopoDS_Vertex& V, const Standard_Bool
{
myLaws = new (GeomFill_HArray1OfSectionLaw)(1, 1);
// gp_Pnt Origine;
gp_Dir D(1, 0, 0); // Following the normal
gp_Dir D(gp_Dir::D::X); // Following the normal
Handle(Geom_Line) L = new (Geom_Line)(BRep_Tool::Pnt(V), D);
Standard_Real Last = 2 * BRep_Tool::Tolerance(V) + Precision::PConfusion();
Handle(Geom_TrimmedCurve) TC = new (Geom_TrimmedCurve)(L, 0, Last);
src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_GridSS.cxx
+1 -1
View File
@@ -216,7 +216,7 @@ TopTools_ListOfShape& losplits)
Vl.Orientation(oriVsup); BB.Add(Esup2pi,Vl); BT.Parameter(Esup2pi,Vl,pl);
gp_Pnt2d tmp = PC->Value(pf); Standard_Real v = tmp.Y();
Handle(Geom2d_Line) L2d =
new Geom2d_Line(gp_Pnt2d(-paronE,v),gp_Dir2d(1.,0.));
new Geom2d_Line(gp_Pnt2d(-paronE,v),gp_Dir2d(gp_Dir2d::D::X));
Handle(Geom2d_TrimmedCurve) PCsup2pi = new Geom2d_TrimmedCurve(L2d,paronE,pl);
TopOpeBRepDS_SetThePCurve(BB,Esup2pi,F,oriE,PCsup2pi);
src/ModelingAlgorithms/TKBool/TopOpeBRepBuild/TopOpeBRepBuild_WireEdgeSet.cxx
+2 -2
View File
@@ -593,9 +593,9 @@ void TopOpeBRepBuild_WireEdgeSet::IsUVISO(const TopoDS_Edge& E,
const gp_Dir2d& D = HL->Direction();
Standard_Real tol = Precision::Angular();
if (D.IsParallel(gp_Dir2d(0., 1.), tol))
if (D.IsParallel(gp_Dir2d(gp_Dir2d::D::Y), tol))
uiso = Standard_True;
else if (D.IsParallel(gp_Dir2d(1., 0.), tol))
else if (D.IsParallel(gp_Dir2d(gp_Dir2d::D::X), tol))
viso = Standard_True;
}
}
src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_BuildTool.cxx
+2 -2
View File
@@ -608,9 +608,9 @@ Standard_Boolean FUN_makeUisoLineOnSphe(const TopoDS_Face& F, // with geometry t
Standard_Boolean isvgrowing = (vsup - vinf > -tol);
gp_Dir2d vdir;
if (isvgrowing)
vdir = gp_Dir2d(0, 1);
vdir = gp_Dir2d(gp_Dir2d::D::Y);
else
vdir = gp_Dir2d(0, -1);
vdir = gp_Dir2d(gp_Dir2d::D::NY);
gp_Pnt2d origin(uinf, vinf);
origin.Translate(gp_Vec2d(vdir).Scaled(p3df - par3dinf));
src/ModelingAlgorithms/TKBool/TopOpeBRepDS/TopOpeBRepDS_FaceInterferenceTool.cxx
+3 -3
View File
@@ -130,11 +130,11 @@ Standard_EXPORT void FUN_ComputeGeomData(const TopoDS_Shape& F,
Standard_Real x = D1.X(), y = D1.Y(), z = D1.Z(), tol = Precision::Confusion();
Standard_Boolean nullx = (Abs(x) < tol), nully = (Abs(y) < tol), nullz = (Abs(z) < tol);
if (nullx && nully)
D2 = gp_Dir(1, 0, 0);
D2 = gp_Dir(gp_Dir::D::X);
else if (nullx && nullz)
D2 = gp_Dir(1, 0, 0);
D2 = gp_Dir(gp_Dir::D::X);
else if (nully && nullz)
D2 = gp_Dir(0, 1, 0);
D2 = gp_Dir(gp_Dir::D::Y);
else
D2 = gp_Dir(y * z, x * z, -2. * x * y);
}
src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_CurveTool.cxx
+1 -1
View File
@@ -1020,7 +1020,7 @@ Handle(Geom2d_Curve) TopOpeBRepTool_CurveTool::MakePCurveOnFace(const TopoDS_Sha
gp_Pnt2d po(0, -M_PI / 2);
if (maxcond)
po.SetY(M_PI / 2);
aTrsf.SetMirror(gp_Ax2d(po, gp_Dir2d(1, 0)));
aTrsf.SetMirror(gp_Ax2d(po, gp_Dir2d(gp_Dir2d::D::X)));
PCT->Transform(aTrsf);
// add translation along U direction on PI
gp_Vec2d vec(M_PI, 0);
src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_GEOMETRY.cxx
+1 -1
View File
@@ -172,7 +172,7 @@ Standard_EXPORT gp_Dir FUN_tool_ngS(const gp_Pnt2d& p2d, const Handle(Geom_Surfa
#ifdef OCCT_DEBUG
std::cout << "FUN_tool_nggeomF NYI" << std::endl;
#endif
return gp_Dir(0, 0, 1);
return gp_Dir(gp_Dir::D::Z);
}
gp_Dir udir(d1u);
src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_ShapeTool.cxx
+2 -2
View File
@@ -331,9 +331,9 @@ Standard_Real TopOpeBRepTool_ShapeTool::PeriodizeParameter(const Standard_Real p
Standard_Real tol = Precision::Angular();
Standard_Boolean isoU = Standard_False, isoV = Standard_False;
if (D.IsParallel(gp_Dir2d(0., 1.), tol))
if (D.IsParallel(gp_Dir2d(gp_Dir2d::D::Y), tol))
isoU = Standard_True;
else if (D.IsParallel(gp_Dir2d(1., 0.), tol))
else if (D.IsParallel(gp_Dir2d(gp_Dir2d::D::X), tol))
isoV = Standard_True;
if (isoU)
{
src/ModelingAlgorithms/TKBool/TopOpeBRepTool/TopOpeBRepTool_matter.cxx
+1 -1
View File
@@ -52,7 +52,7 @@ Standard_EXPORT gp_Dir2d FUN_tool_nC2dINSIDES(const gp_Dir2d& tgC2d)
// X = (tgC2d,0),Y = (xx,0),Z =(0,0,1)
// ------------------------------------------------------------
gp_Dir X, Y, Z;
Z = gp_Dir(0., 0., 1.);
Z = gp_Dir(gp_Dir::D::Z);
X = gp_Dir(tgC2d.X(), tgC2d.Y(), 0.);
Y = Z ^ X;
gp_Dir2d xx(Y.X(), Y.Y());
src/ModelingAlgorithms/TKFeat/BRepFeat/BRepFeat_RibSlot.cxx
+1 -1
View File
@@ -496,7 +496,7 @@ gp_Dir BRepFeat_RibSlot::Normal(const TopoDS_Face& F, const gp_Pnt& P)
break;
default: {
return gp_Dir(1., 0., 0.);
return gp_Dir(gp_Dir::D::X);
}
}
src/ModelingAlgorithms/TKFillet/BlendFunc/BlendFunc.cxx
+1 -1
View File
@@ -109,7 +109,7 @@ void BlendFunc::GetMinimalWeights(const BlendFunc_SectionShape SShape,
break;
case BlendFunc_Rational:
case BlendFunc_QuasiAngular: {
gp_Ax2 popAx2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 popAx2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
gp_Circ C(popAx2, 1);
Handle(Geom_TrimmedCurve) Sect1 = new Geom_TrimmedCurve(new Geom_Circle(C), 0., MaxAng);
Handle(Geom_BSplineCurve) CtoBspl = GeomConvert::CurveToBSplineCurve(Sect1, TConv);
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn.cxx
+1 -1
View File
@@ -79,7 +79,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const GccEnt_QualifiedCirc& Qualified1,
gp_Circ2d C2 = Qualified2.Qualified();
Standard_Real R1 = C1.Radius();
Standard_Real R2 = C2.Radius();
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Pnt2d center1(C1.Location());
gp_Pnt2d center2(C2.Location());
TColStd_Array1OfReal Radius(1, 2);
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn_1.cxx
+1 -1
View File
@@ -77,7 +77,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const GccEnt_QualifiedCirc& Qualified1,
Standard_Real Tol = Abs(Tolerance);
Standard_Real Radius = 0;
Standard_Boolean ok = Standard_False;
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Circ2d C1 = Qualified1.Qualified();
gp_Lin2d L2 = Qualified2.Qualified();
Standard_Real R1 = C1.Radius();
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn_10.cxx
+1 -1
View File
@@ -73,7 +73,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const GccEnt_QualifiedLin& Qualified1,
return;
}
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Lin2d L1 = Qualified1.Qualified();
gp_Pnt2d originL1(L1.Location());
gp_Dir2d dirL1(L1.Direction());
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn_11.cxx
+1 -1
View File
@@ -66,7 +66,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const gp_Pnt2d& Point1,
TheSame2.Init(0);
WellDone = Standard_False;
NbrSol = 0;
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
Standard_Real dist = Point1.Distance(Point2);
Standard_Real dp1cen = Point1.Distance(OnCirc.Location());
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn_2.cxx
+1 -1
View File
@@ -58,7 +58,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const GccEnt_QualifiedLin& Qualified1,
return;
}
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
// calculation of bisectrices of L1 and L2
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn_3.cxx
+1 -1
View File
@@ -75,7 +75,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const GccEnt_QualifiedCirc& Qualified1,
return;
}
TColStd_Array1OfReal Radius(1, 2);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Circ2d C1 = Qualified1.Qualified();
Standard_Real R1 = C1.Radius();
gp_Pnt2d center1(C1.Location());
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn_4.cxx
+1 -1
View File
@@ -76,7 +76,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const GccEnt_QualifiedLin& Qualified1,
return;
}
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Lin2d L1 = Qualified1.Qualified();
gp_Pnt2d originL1(L1.Location());
gp_Dir2d dirL1(L1.Direction());
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn_5.cxx
+1 -1
View File
@@ -59,7 +59,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const gp_Pnt2d& Point1,
WellDone = Standard_False;
NbrSol = 0;
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real dist = Point1.Distance(Point2);
if (dist < Abs(Tolerance))
{
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn_6.cxx
+1 -1
View File
@@ -75,7 +75,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const GccEnt_QualifiedCirc& Qualified1,
Standard_Real Tol = Abs(Tolerance);
gp_Circ2d C1 = Qualified1.Qualified();
gp_Circ2d C2 = Qualified2.Qualified();
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
TColStd_Array1OfReal Radius(1, 2);
TColStd_Array1OfReal Rradius(1, 2);
gp_Pnt2d center1(C1.Location());
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn_7.cxx
+1 -1
View File
@@ -62,7 +62,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const GccEnt_QualifiedCirc& Qualified1,
return;
}
Standard_Real Radius = 0;
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Circ2d C1 = Qualified1.Qualified();
gp_Lin2d L2 = Qualified2.Qualified();
Standard_Real R1 = C1.Radius();
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn_8.cxx
+1 -1
View File
@@ -69,7 +69,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const GccEnt_QualifiedCirc& Qualified1,
}
Standard_Real Tol = Abs(Tolerance);
TColStd_Array1OfReal Radius(1, 2);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Circ2d C1 = Qualified1.Qualified();
Standard_Real R1 = C1.Radius();
gp_Pnt2d center1(C1.Location());
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanOn_9.cxx
+1 -1
View File
@@ -51,7 +51,7 @@ GccAna_Circ2d2TanOn::GccAna_Circ2d2TanOn(const GccEnt_QualifiedLin& Qualified1,
WellDone = Standard_False;
NbrSol = 0;
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
if (!(Qualified1.IsEnclosed() || Qualified1.IsOutside() || Qualified1.IsUnqualified())
|| !(Qualified2.IsEnclosed() || Qualified2.IsOutside() || Qualified2.IsUnqualified()))
{
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanRad.cxx
+1 -1
View File
@@ -57,7 +57,7 @@ GccAna_Circ2d2TanRad::GccAna_Circ2d2TanRad(const GccEnt_QualifiedCirc& Qualified
{
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
WellDone = Standard_False;
NbrSol = 0;
if (!(Qualified1.IsEnclosed() || Qualified1.IsEnclosing() || Qualified1.IsOutside()
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanRad_1.cxx
+1 -1
View File
@@ -58,7 +58,7 @@ GccAna_Circ2d2TanRad::GccAna_Circ2d2TanRad(const GccEnt_QualifiedCirc& Qualified
{
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
NbrSol = 0;
WellDone = Standard_False;
if (!(Qualified1.IsEnclosed() || Qualified1.IsEnclosing() || Qualified1.IsOutside()
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanRad_2.cxx
+1 -1
View File
@@ -56,7 +56,7 @@ GccAna_Circ2d2TanRad::GccAna_Circ2d2TanRad(const GccEnt_QualifiedCirc& Qualified
pararg2(1, 4)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
NbrSol = 0;
WellDone = Standard_False;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanRad_3.cxx
+1 -1
View File
@@ -60,7 +60,7 @@ GccAna_Circ2d2TanRad::GccAna_Circ2d2TanRad(const GccEnt_QualifiedLin& Qualified1
pararg2(1, 2)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
NbrSol = 0;
WellDone = Standard_False;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanRad_4.cxx
+1 -1
View File
@@ -56,7 +56,7 @@ GccAna_Circ2d2TanRad::GccAna_Circ2d2TanRad(const GccEnt_QualifiedLin& Qualified1
pararg2(1, 4)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
TColStd_Array1OfReal cote1(1, 2);
TColStd_Array1OfReal cote2(1, 2);
Standard_Integer nbrcote1 = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d2TanRad_5.cxx
+1 -1
View File
@@ -47,7 +47,7 @@ GccAna_Circ2d2TanRad::GccAna_Circ2d2TanRad(const gp_Pnt2d& Point1,
pararg2(1, 2)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
NbrSol = 0;
WellDone = Standard_False;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d3Tan.cxx
+1 -1
View File
@@ -56,7 +56,7 @@ GccAna_Circ2d3Tan::GccAna_Circ2d3Tan(const GccEnt_QualifiedCirc& Qualified1,
pararg3(1, 16)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
WellDone = Standard_False;
NbrSol = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d3Tan_1.cxx
+1 -1
View File
@@ -61,7 +61,7 @@ GccAna_Circ2d3Tan::GccAna_Circ2d3Tan(const GccEnt_QualifiedCirc& Qualified1,
pararg3(1, 16)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
WellDone = Standard_False;
NbrSol = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d3Tan_2.cxx
+1 -1
View File
@@ -62,7 +62,7 @@ GccAna_Circ2d3Tan::GccAna_Circ2d3Tan(const GccEnt_QualifiedCirc& Qualified1,
TheSame1.Init(0);
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
WellDone = Standard_False;
NbrSol = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d3Tan_3.cxx
+1 -1
View File
@@ -65,7 +65,7 @@ GccAna_Circ2d3Tan::GccAna_Circ2d3Tan(const GccEnt_QualifiedLin& Qualified1,
TheSame1.Init(0);
TheSame2.Init(0);
TheSame3.Init(0);
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
WellDone = Standard_False;
NbrSol = 0;
if (!(Qualified1.IsEnclosed() || Qualified1.IsOutside() || Qualified1.IsUnqualified())
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d3Tan_4.cxx
+1 -1
View File
@@ -65,7 +65,7 @@ GccAna_Circ2d3Tan::GccAna_Circ2d3Tan(const GccEnt_QualifiedCirc& Qualified1,
pararg3(1, MaxSol)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
WellDone = Standard_False;
NbrSol = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d3Tan_5.cxx
+1 -1
View File
@@ -63,7 +63,7 @@ GccAna_Circ2d3Tan::GccAna_Circ2d3Tan(const GccEnt_QualifiedCirc& Qualified1,
pararg3(1, 4)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
Standard_Real MaxRad = 1e10, MinRad = 1e-6;
WellDone = Standard_False;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d3Tan_6.cxx
+1 -1
View File
@@ -55,7 +55,7 @@ GccAna_Circ2d3Tan::GccAna_Circ2d3Tan(const GccEnt_QualifiedLin& Qualified1,
pararg3(1, 2)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
WellDone = Standard_False;
Standard_Real Tol = Abs(Tolerance);
NbrSol = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d3Tan_7.cxx
+1 -1
View File
@@ -57,7 +57,7 @@ GccAna_Circ2d3Tan::GccAna_Circ2d3Tan(const GccEnt_QualifiedCirc& Qualified1,
pararg3(1, 2)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
WellDone = Standard_False;
NbrSol = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d3Tan_8.cxx
+1 -1
View File
@@ -58,7 +58,7 @@ GccAna_Circ2d3Tan::GccAna_Circ2d3Tan(const GccEnt_QualifiedLin& Qualified1,
WellDone = Standard_False;
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
NbrSol = 0;
if (!(Qualified1.IsEnclosed() || Qualified1.IsOutside() || Qualified1.IsUnqualified()))
{
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2d3Tan_9.cxx
+1 -1
View File
@@ -65,7 +65,7 @@ GccAna_Circ2d3Tan::GccAna_Circ2d3Tan(const gp_Pnt2d& Point1,
pararg3(1, 1)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
WellDone = Standard_False;
NbrSol = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2dBisec.cxx
+1 -1
View File
@@ -175,7 +175,7 @@ Handle(GccInt_Bisec) GccAna_Circ2dBisec::ThisSolution(const Standard_Integer Ind
dircen.SetCoord(xcencir2 - xcencir1, ycencir2 - ycencir1);
medcen.SetCoord(ycencir2 - ycencir1, xcencir1 - xcencir2);
}
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Ax2d acenx(pcen, dirx);
gp_Ax2d acencen(pcen, dircen);
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2dTanCen.cxx
+3 -3
View File
@@ -65,7 +65,7 @@ GccAna_Circ2dTanCen::GccAna_Circ2dTanCen(const GccEnt_QualifiedCirc& Qualified1,
throw GccEnt_BadQualifier();
return;
}
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
gp_Circ2d C1 = Qualified1.Qualified();
Standard_Real R1 = C1.Radius();
@@ -210,7 +210,7 @@ GccAna_Circ2dTanCen::GccAna_Circ2dTanCen(const gp_Lin2d& Linetan, const gp_Pnt2d
pararg1(1, 1)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real rayon = Linetan.Distance(Pcenter);
cirsol(1) = gp_Circ2d(gp_Ax2d(Pcenter, dirx), rayon);
// ==================================================
@@ -258,7 +258,7 @@ GccAna_Circ2dTanCen::GccAna_Circ2dTanCen(const gp_Pnt2d& Point1, const gp_Pnt2d&
pararg1(1, 1)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real rayon = Point1.Distance(Pcenter);
cirsol(1) = gp_Circ2d(gp_Ax2d(Pcenter, dirx), rayon);
// =================================================
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2dTanOnRad.cxx
+1 -1
View File
@@ -68,7 +68,7 @@ GccAna_Circ2dTanOnRad::GccAna_Circ2dTanOnRad(const GccEnt_QualifiedCirc& Qualifi
{
TheSame1.Init(0);
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
WellDone = Standard_False;
NbrSol = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2dTanOnRad_1.cxx
+1 -1
View File
@@ -54,7 +54,7 @@ GccAna_Circ2dTanOnRad::GccAna_Circ2dTanOnRad(const GccEnt_QualifiedLin& Qualifie
{
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
WellDone = Standard_False;
NbrSol = 0;
if (!(Qualified1.IsEnclosed() || Qualified1.IsOutside() || Qualified1.IsUnqualified()))
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2dTanOnRad_2.cxx
+1 -1
View File
@@ -55,7 +55,7 @@ GccAna_Circ2dTanOnRad::GccAna_Circ2dTanOnRad(const gp_Pnt2d& Point1,
parcen3(1, 2)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
WellDone = Standard_False;
NbrSol = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2dTanOnRad_3.cxx
+1 -1
View File
@@ -52,7 +52,7 @@ GccAna_Circ2dTanOnRad::GccAna_Circ2dTanOnRad(const GccEnt_QualifiedCirc& Qualifi
{
TheSame1.Init(0);
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
Standard_Integer signe[5];
signe[0] = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2dTanOnRad_4.cxx
+1 -1
View File
@@ -57,7 +57,7 @@ GccAna_Circ2dTanOnRad::GccAna_Circ2dTanOnRad(const GccEnt_QualifiedLin& Qualifie
{
TheSame1.Init(0);
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
WellDone = Standard_False;
NbrSol = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_Circ2dTanOnRad_5.cxx
+1 -1
View File
@@ -49,7 +49,7 @@ GccAna_Circ2dTanOnRad::GccAna_Circ2dTanOnRad(const gp_Pnt2d& Point1,
parcen3(1, 2)
{
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
WellDone = Standard_False;
NbrSol = 0;
src/ModelingAlgorithms/TKGeomAlgo/GccAna/GccAna_CircPnt2dBisec.cxx
+1 -1
View File
@@ -107,7 +107,7 @@ Handle(GccInt_Bisec) GccAna_CircPnt2dBisec::ThisSolution(const Standard_Integer
if (dist < myTolerance)
{
gp_Circ2d biscirpnt1(gp_Ax2d(point, gp_Dir2d(1.0, 0.0)), R1 / 2.);
gp_Circ2d biscirpnt1(gp_Ax2d(point, gp_Dir2d(gp_Dir2d::D::X)), R1 / 2.);
bissol = new GccInt_BCirc(biscirpnt1);
// ==========================================================
}
src/ModelingAlgorithms/TKGeomAlgo/Geom2dGcc/Geom2dGcc_Circ2d2TanOnGeo.cxx
+6 -6
View File
@@ -87,7 +87,7 @@ Geom2dGcc_Circ2d2TanOnGeo::Geom2dGcc_Circ2d2TanOnGeo(const GccEnt_QualifiedCirc&
gp_Circ2d C2 = Qualified2.Qualified();
Standard_Real R1 = C1.Radius();
Standard_Real R2 = C2.Radius();
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Pnt2d center1(C1.Location());
gp_Pnt2d center2(C2.Location());
GccAna_Circ2dBisec Bis(C1, C2);
@@ -354,7 +354,7 @@ Geom2dGcc_Circ2d2TanOnGeo::Geom2dGcc_Circ2d2TanOnGeo(const GccEnt_QualifiedCirc&
throw GccEnt_BadQualifier();
return;
}
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Circ2d C1 = Qualified1.Qualified();
gp_Lin2d L2 = Qualified2.Qualified();
Standard_Real R1 = C1.Radius();
@@ -566,7 +566,7 @@ Geom2dGcc_Circ2d2TanOnGeo::Geom2dGcc_Circ2d2TanOnGeo(const GccEnt_QualifiedLin&
}
Standard_Real Tol = Abs(Tolerance);
Standard_Real Radius = 0;
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Lin2d L1 = Qualified1.Qualified();
gp_Lin2d L2 = Qualified2.Qualified();
gp_Dir2d dir1(L1.Direction());
@@ -748,7 +748,7 @@ Geom2dGcc_Circ2d2TanOnGeo::Geom2dGcc_Circ2d2TanOnGeo(const GccEnt_QualifiedCirc&
}
Standard_Real Tol = Abs(Tolerance);
Standard_Real Radius;
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Circ2d C1 = Qualified1.Qualified();
Standard_Real R1 = C1.Radius();
gp_Pnt2d center1(C1.Location());
@@ -941,7 +941,7 @@ Geom2dGcc_Circ2d2TanOnGeo::Geom2dGcc_Circ2d2TanOnGeo(const GccEnt_QualifiedLin&
throw GccEnt_BadQualifier();
return;
}
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Lin2d L1 = Qualified1.Qualified();
gp_Pnt2d origin1(L1.Location());
gp_Dir2d dir1(L1.Direction());
@@ -1090,7 +1090,7 @@ Geom2dGcc_Circ2d2TanOnGeo::Geom2dGcc_Circ2d2TanOnGeo(const gp_Pnt2d&
Standard_Real lastparam;
Standard_Real Tol = Abs(Tolerance);
NbrSol = 0;
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
GccAna_Pnt2dBisec Bis(Point1, Point2);
if (Bis.IsDone())
{
src/ModelingAlgorithms/TKGeomAlgo/Geom2dGcc/Geom2dGcc_Circ2d2TanOnIter.cxx
+12 -12
View File
@@ -69,7 +69,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const GccEnt_QualifiedLin
throw GccEnt_BadQualifier();
return;
}
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Lin2d L1 = Qualified1.Qualified();
Geom2dAdaptor_Curve Cu2 = Qualified2.Qualified();
math_Vector Umin(1, 4);
@@ -178,7 +178,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const Geom2dGcc_QCurve& Q
return;
}
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
Geom2dAdaptor_Curve Cu1 = Qualified1.Qualified();
Geom2dAdaptor_Curve Cu2 = Qualified2.Qualified();
math_Vector Umin(1, 4);
@@ -296,7 +296,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const Geom2dGcc_QCurve& Q
return;
}
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
Geom2dAdaptor_Curve Cu1 = Qualified1.Qualified();
math_Vector Umin(1, 3);
math_Vector Umax(1, 3);
@@ -391,7 +391,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const GccEnt_QualifiedCir
return;
}
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Circ2d C1 = Qualified1.Qualified();
Standard_Real R1 = C1.Radius();
Geom2dAdaptor_Curve Cu2 = Qualified2.Qualified();
@@ -507,7 +507,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const GccEnt_QualifiedCir
return;
}
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Circ2d C1 = Qualified1.Qualified();
Standard_Real R1 = C1.Radius();
Geom2dAdaptor_Curve Cu2 = Qualified2.Qualified();
@@ -620,7 +620,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const GccEnt_QualifiedLin
return;
}
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Lin2d L1 = Qualified1.Qualified();
Geom2dAdaptor_Curve Cu2 = Qualified2.Qualified();
math_Vector Umin(1, 4);
@@ -731,7 +731,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const Geom2dGcc_QCurve& Q
return;
}
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
Geom2dAdaptor_Curve Cu1 = Qualified1.Qualified();
Geom2dAdaptor_Curve Cu2 = Qualified2.Qualified();
math_Vector Umin(1, 4);
@@ -849,7 +849,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const Geom2dGcc_QCurve& Q
return;
}
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
Geom2dAdaptor_Curve Cu1 = Qualified1.Qualified();
math_Vector Umin(1, 3);
math_Vector Umax(1, 3);
@@ -944,7 +944,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const Geom2dGcc_QCurve&
throw GccEnt_BadQualifier();
return;
}
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
Geom2dAdaptor_Curve Cu1 = Qualified1.Qualified();
Geom2dAdaptor_Curve Cu2 = Qualified2.Qualified();
math_Vector Umin(1, 4);
@@ -1102,7 +1102,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const GccEnt_QualifiedCir
Standard_Real dist2 = point3.Distance(point2);
if (Abs(dist1 - dist2) / 2. <= Tol)
{
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
cirsol = gp_Circ2d(gp_Ax2d(point3, dirx), (dist1 + dist2) / 2.);
Standard_Real normetan2 = Tan2.Magnitude();
gp_Vec2d Vec1(point1.XY(), point3.XY());
@@ -1170,7 +1170,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const GccEnt_QualifiedLin
return;
}
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
gp_Lin2d L1 = Qualified1.Qualified();
Geom2dAdaptor_Curve Cu2 = Qualified2.Qualified();
math_Vector Umin(1, 4);
@@ -1274,7 +1274,7 @@ Geom2dGcc_Circ2d2TanOnIter::Geom2dGcc_Circ2d2TanOnIter(const Geom2dGcc_QCurve&
return;
}
Standard_Real Tol = Abs(Tolerance);
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
Geom2dAdaptor_Curve Cu1 = Qualified1.Qualified();
math_Vector Umin(1, 3);
math_Vector Umax(1, 3);
src/ModelingAlgorithms/TKGeomAlgo/Geom2dGcc/Geom2dGcc_Circ2d2TanRadGeo.cxx
+5 -5
View File
@@ -80,7 +80,7 @@ Geom2dGcc_Circ2d2TanRadGeo::Geom2dGcc_Circ2d2TanRadGeo(const GccEnt_QualifiedLin
Standard_Real thelast = 100000.;
Standard_Real firstparam;
Standard_Real lastparam;
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
TColStd_Array1OfReal cote1(1, 2);
TColStd_Array1OfReal cote2(1, 2);
Standard_Integer nbrcote1 = 0;
@@ -294,7 +294,7 @@ Geom2dGcc_Circ2d2TanRadGeo::Geom2dGcc_Circ2d2TanRadGeo(const GccEnt_QualifiedCir
Standard_Real thelast = 100000.;
Standard_Real firstparam;
Standard_Real lastparam;
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
TColStd_Array1OfReal cote1(1, 2);
TColStd_Array1OfReal cote2(1, 2);
Standard_Integer nbrcote1 = 0;
@@ -519,7 +519,7 @@ Geom2dGcc_Circ2d2TanRadGeo::Geom2dGcc_Circ2d2TanRadGeo(const Geom2dGcc_QCurve& Q
Standard_Real thelast = 100000.;
Standard_Real firstparam;
Standard_Real lastparam;
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
TColStd_Array1OfReal cote1(1, 2);
Standard_Integer nbrcote1 = 0;
WellDone = Standard_False;
@@ -556,7 +556,7 @@ Geom2dGcc_Circ2d2TanRadGeo::Geom2dGcc_Circ2d2TanRadGeo(const Geom2dGcc_QCurve& Q
cote1(1) = Radius;
cote1(2) = -Radius;
}
gp_Circ2d Circ(gp_Ax2d(Point2, gp_Dir2d(1., 0.)), Radius);
gp_Circ2d Circ(gp_Ax2d(Point2, gp_Dir2d(gp_Dir2d::D::X)), Radius);
IntRes2d_Domain D1(ElCLib::Value(0., Circ),
0.,
Tol,
@@ -812,7 +812,7 @@ Geom2dGcc_Circ2d2TanRadGeo::Geom2dGcc_Circ2d2TanRadGeo(const Geom2dGcc_QCurve& Q
const Standard_Real thefirst = -100000.;
const Standard_Real thelast = 100000.;
#endif
gp_Dir2d dirx(1., 0.);
gp_Dir2d dirx(gp_Dir2d::D::X);
TColStd_Array1OfReal cote1(1, 2);
TColStd_Array1OfReal cote2(1, 2);
Standard_Integer nbrcote1 = 0;
src/ModelingAlgorithms/TKGeomAlgo/Geom2dGcc/Geom2dGcc_Circ2d3TanIter.cxx
+5 -8
View File
@@ -806,7 +806,7 @@ Geom2dGcc_Circ2d3TanIter::Geom2dGcc_Circ2d3TanIter(const Geom2dGcc_QCurve& Quali
throw GccEnt_BadQualifier();
return;
}
gp_Circ2d C1(gp_Ax2d(Point3, gp_Dir2d(1., 0.)), 0.);
gp_Circ2d C1(gp_Ax2d(Point3, gp_Dir2d(gp_Dir2d::D::X)), 0.);
Geom2dAdaptor_Curve Cu1 = Qualified1.Qualified();
Geom2dAdaptor_Curve Cu2 = Qualified2.Qualified();
Geom2dGcc_FunctionTanCuCuCu Func(C1, Cu1, Cu2);
@@ -937,9 +937,8 @@ Geom2dGcc_Circ2d3TanIter::Geom2dGcc_Circ2d3TanIter(const Geom2dGcc_QCurve& Quali
throw GccEnt_BadQualifier();
return;
}
gp_Dir2d dirx(1., 0.);
gp_Circ2d C1(gp_Ax2d(Point2, dirx), 0.);
gp_Circ2d C2(gp_Ax2d(Point3, dirx), 0.);
gp_Circ2d C1(gp_Ax2d(Point2, gp_Dir2d(gp_Dir2d::D::X)), 0.);
gp_Circ2d C2(gp_Ax2d(Point3, gp_Dir2d(gp_Dir2d::D::X)), 0.);
Geom2dAdaptor_Curve Cu1 = Qualified1.Qualified();
Geom2dGcc_FunctionTanCuCuCu Func(C1, C2, Cu1);
math_Vector Umin(1, 3);
@@ -1065,10 +1064,9 @@ Geom2dGcc_Circ2d3TanIter::Geom2dGcc_Circ2d3TanIter(const GccEnt_QualifiedLin& Qu
throw GccEnt_BadQualifier();
return;
}
gp_Dir2d dirx(1., 0.);
gp_Lin2d L1 = Qualified1.Qualified();
Geom2dAdaptor_Curve Cu2 = Qualified2.Qualified();
gp_Circ2d C3(gp_Ax2d(Point3, dirx), 0.);
gp_Circ2d C3(gp_Ax2d(Point3, gp_Dir2d(gp_Dir2d::D::X)), 0.);
Geom2dGcc_FunctionTanCuCuCu Func(C3, L1, Cu2);
math_Vector Umin(1, 3);
math_Vector Umax(1, 3);
@@ -1350,8 +1348,7 @@ Geom2dGcc_Circ2d3TanIter::Geom2dGcc_Circ2d3TanIter(const GccEnt_QualifiedCirc& Q
}
gp_Circ2d C1 = Qualified1.Qualified();
Geom2dAdaptor_Curve Cu2 = Qualified2.Qualified();
gp_Dir2d dirx(1., 0.);
gp_Circ2d C3(gp_Ax2d(Point3, dirx), 0.);
gp_Circ2d C3(gp_Ax2d(Point3, gp_Dir2d(gp_Dir2d::D::X)), 0.);
Geom2dGcc_FunctionTanCuCuCu Func(C1, C3, Cu2);
math_Vector Umin(1, 3);
math_Vector Umax(1, 3);
src/ModelingAlgorithms/TKGeomAlgo/Geom2dGcc/Geom2dGcc_Circ2dTanCenGeo.cxx
+1 -1
View File
@@ -57,7 +57,7 @@ Geom2dGcc_Circ2dTanCenGeo::Geom2dGcc_Circ2dTanCenGeo(const Geom2dGcc_QCurve& Qua
theDist2(2) = 0.;
Standard_Integer i = 1;
Standard_Integer nbsol = 0;
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real thePar;
Geom2dAdaptor_Curve curve = Qualified1.Qualified();
Extrema_ExtPC2d distmin(Pcenter,
src/ModelingAlgorithms/TKGeomAlgo/Geom2dGcc/Geom2dGcc_Circ2dTanOnRadGeo.cxx
+7 -7
View File
@@ -83,7 +83,7 @@ Geom2dGcc_Circ2dTanOnRadGeo::Geom2dGcc_Circ2dTanOnRadGeo(const Geom2dGcc_QCurve&
// Traitement. +
//=========================================================================
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real Tol = Abs(Tolerance);
Standard_Real thefirst = -100000.;
Standard_Real thelast = 100000.;
@@ -208,7 +208,7 @@ Geom2dGcc_Circ2dTanOnRadGeo::Geom2dGcc_Circ2dTanOnRadGeo(const Geom2dGcc_QCurve&
// Traitement. +
//=========================================================================
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real thefirst = -100000.;
Standard_Real thelast = 100000.;
Standard_Real firstparam;
@@ -339,7 +339,7 @@ Geom2dGcc_Circ2dTanOnRadGeo::Geom2dGcc_Circ2dTanOnRadGeo(const GccEnt_QualifiedC
// Traitement. +
//=========================================================================
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real thefirst = -100000.;
Standard_Real thelast = 100000.;
Standard_Real firstparam;
@@ -486,7 +486,7 @@ Geom2dGcc_Circ2dTanOnRadGeo::Geom2dGcc_Circ2dTanOnRadGeo(const GccEnt_QualifiedL
// Traitement. +
//=========================================================================
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real thefirst = -100000.;
Standard_Real thelast = 100000.;
Standard_Real firstparam;
@@ -624,7 +624,7 @@ Geom2dGcc_Circ2dTanOnRadGeo::Geom2dGcc_Circ2dTanOnRadGeo(const Geom2dGcc_QCurve&
// Traitement. +
//=========================================================================
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real thefirst = -100000.;
Standard_Real thelast = 100000.;
Standard_Real firstparam;
@@ -758,7 +758,7 @@ Geom2dGcc_Circ2dTanOnRadGeo::Geom2dGcc_Circ2dTanOnRadGeo(const gp_Pnt2d&
// Traitement. +
//=========================================================================
gp_Dir2d dirx(1.0, 0.0);
gp_Dir2d dirx(gp_Dir2d::D::X);
Standard_Real thefirst = -100000.;
Standard_Real thelast = 100000.;
Standard_Real firstparam;
@@ -774,7 +774,7 @@ Geom2dGcc_Circ2dTanOnRadGeo::Geom2dGcc_Circ2dTanOnRadGeo(const gp_Pnt2d&
else
{
// gp_Dir2d Dir(-y1dir,x1dir);
gp_Circ2d Circ(gp_Ax2d(Point1, gp_Dir2d(1., 0.)), Radius);
gp_Circ2d Circ(gp_Ax2d(Point1, gp_Dir2d(gp_Dir2d::D::X)), Radius);
IntRes2d_Domain D1(ElCLib::Value(0., Circ),
0.,
Tol,
src/ModelingAlgorithms/TKGeomAlgo/Geom2dHatch/Geom2dHatch_Elements.cxx
+1 -1
View File
@@ -184,7 +184,7 @@ Standard_Boolean Geom2dHatch_Elements::OtherSegment(const gp_Pnt2d& P,
}
Par = RealLast();
L = gp_Lin2d(P, gp_Dir2d(1, 0));
L = gp_Lin2d(P, gp_Dir2d(gp_Dir2d::D::X));
return Standard_False;
}
src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill.cxx
+2 -2
View File
@@ -240,7 +240,7 @@ void GeomFill::GetMinimalWeights(const Convert_ParameterisationType TConv,
Weights.Init(1);
else
{
gp_Ax2 popAx2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 popAx2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
gp_Circ C(popAx2, 1);
Handle(Geom_TrimmedCurve) Sect1 = new Geom_TrimmedCurve(new Geom_Circle(C), 0., MaxAng);
Handle(Geom_BSplineCurve) CtoBspl = GeomConvert::CurveToBSplineCurve(Sect1, TConv);
@@ -326,7 +326,7 @@ Standard_Real GeomFill::GetTolerance(const Convert_ParameterisationType TConv,
const Standard_Real AngularTol,
const Standard_Real SpatialTol)
{
gp_Ax2 popAx2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 popAx2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
gp_Circ C(popAx2, Radius);
Handle(Geom_Circle) popCircle = new Geom_Circle(C);
Handle(Geom_TrimmedCurve) Sect = new Geom_TrimmedCurve(popCircle, 0., Max(AngleMin, 0.02));
src/ModelingAlgorithms/TKGeomAlgo/GeomFill/GeomFill_Sweep.cxx
+3 -3
View File
@@ -306,7 +306,7 @@ Standard_Boolean GeomFill_Sweep::BuildAll(const GeomAbs_Shape Continuity,
Handle(Geom_BSplineSurface) BSplSurf(Handle(Geom_BSplineSurface)::DownCast(mySurface));
gp_Dir2d D(0., 1.);
gp_Dir2d D(gp_Dir2d::D::Y);
gp_Pnt2d P(BSplSurf->UKnot(1), 0);
Handle(Geom2d_Line) LC1 = new (Geom2d_Line)(P, D);
Handle(Geom2d_TrimmedCurve) TC1 =
@@ -363,7 +363,7 @@ Standard_Boolean GeomFill_Sweep::BuildAll(const GeomAbs_Shape Continuity,
// les iso Bords.
if (!myLoc->HasFirstRestriction())
{
gp_Dir2d D(0., 1.);
gp_Dir2d D(gp_Dir2d::D::Y);
gp_Pnt2d P(UKnots(UKnots.Lower()), 0);
Handle(Geom2d_Line) LC = new (Geom2d_Line)(P, D);
Handle(Geom2d_TrimmedCurve) TC = new (Geom2d_TrimmedCurve)(LC, First, Last);
@@ -375,7 +375,7 @@ Standard_Boolean GeomFill_Sweep::BuildAll(const GeomAbs_Shape Continuity,
if (!myLoc->HasLastRestriction())
{
gp_Dir2d D(0., 1.);
gp_Dir2d D(gp_Dir2d::D::Y);
gp_Pnt2d P(UKnots(UKnots.Upper()), 0);
Handle(Geom2d_Line) LC = new (Geom2d_Line)(P, D);
Handle(Geom2d_TrimmedCurve) TC = new (Geom2d_TrimmedCurve)(LC, First, Last);
src/ModelingAlgorithms/TKGeomAlgo/GeomInt/GeomInt_IntSS_1.cxx
+8 -8
View File
@@ -1321,7 +1321,7 @@ void GeomInt_IntSS::TrimILineOnSurfBoundaries(const Handle(Geom2d_Curve)& theC2d
{
if (!Precision::IsInfinite(aU1f))
{
aCurS1Bounds[0] = new Geom2d_Line(gp_Pnt2d(aU1f, aV1f), gp_Dir2d(0.0, 1.0));
aCurS1Bounds[0] = new Geom2d_Line(gp_Pnt2d(aU1f, aV1f), gp_Dir2d(gp_Dir2d::D::Y));
if (!Precision::IsInfinite(aDelta))
aCurS1Bounds[0] = new Geom2d_TrimmedCurve(aCurS1Bounds[0], 0, aDelta);
@@ -1329,7 +1329,7 @@ void GeomInt_IntSS::TrimILineOnSurfBoundaries(const Handle(Geom2d_Curve)& theC2d
if (!Precision::IsInfinite(aU1l))
{
aCurS1Bounds[1] = new Geom2d_Line(gp_Pnt2d(aU1l, aV1f), gp_Dir2d(0.0, 1.0));
aCurS1Bounds[1] = new Geom2d_Line(gp_Pnt2d(aU1l, aV1f), gp_Dir2d(gp_Dir2d::D::Y));
if (!Precision::IsInfinite(aDelta))
aCurS1Bounds[1] = new Geom2d_TrimmedCurve(aCurS1Bounds[1], 0, aDelta);
}
@@ -1340,14 +1340,14 @@ void GeomInt_IntSS::TrimILineOnSurfBoundaries(const Handle(Geom2d_Curve)& theC2d
{
if (!Precision::IsInfinite(aV1f))
{
aCurS1Bounds[2] = new Geom2d_Line(gp_Pnt2d(aU1f, aV1f), gp_Dir2d(1.0, 0.0));
aCurS1Bounds[2] = new Geom2d_Line(gp_Pnt2d(aU1f, aV1f), gp_Dir2d(gp_Dir2d::D::X));
if (!Precision::IsInfinite(aDelta))
aCurS1Bounds[2] = new Geom2d_TrimmedCurve(aCurS1Bounds[2], 0, aDelta);
}
if (!Precision::IsInfinite(aV1l))
{
aCurS1Bounds[3] = new Geom2d_Line(gp_Pnt2d(aU1l, aV1l), gp_Dir2d(1.0, 0.0));
aCurS1Bounds[3] = new Geom2d_Line(gp_Pnt2d(aU1f, aV1l), gp_Dir2d(gp_Dir2d::D::X));
if (!Precision::IsInfinite(aDelta))
aCurS1Bounds[3] = new Geom2d_TrimmedCurve(aCurS1Bounds[3], 0, aDelta);
}
@@ -1358,14 +1358,14 @@ void GeomInt_IntSS::TrimILineOnSurfBoundaries(const Handle(Geom2d_Curve)& theC2d
{
if (!Precision::IsInfinite(aU2f))
{
aCurS2Bounds[0] = new Geom2d_Line(gp_Pnt2d(aU2f, aV2f), gp_Dir2d(0.0, 1.0));
aCurS2Bounds[0] = new Geom2d_Line(gp_Pnt2d(aU2f, aV2f), gp_Dir2d(gp_Dir2d::D::Y));
if (!Precision::IsInfinite(aDelta))
aCurS2Bounds[0] = new Geom2d_TrimmedCurve(aCurS2Bounds[0], 0, aDelta);
}
if (!Precision::IsInfinite(aU2l))
{
aCurS2Bounds[1] = new Geom2d_Line(gp_Pnt2d(aU2l, aV2f), gp_Dir2d(0.0, 1.0));
aCurS2Bounds[1] = new Geom2d_Line(gp_Pnt2d(aU2l, aV2f), gp_Dir2d(gp_Dir2d::D::Y));
if (!Precision::IsInfinite(aDelta))
aCurS2Bounds[1] = new Geom2d_TrimmedCurve(aCurS2Bounds[1], 0, aDelta);
}
@@ -1376,14 +1376,14 @@ void GeomInt_IntSS::TrimILineOnSurfBoundaries(const Handle(Geom2d_Curve)& theC2d
{
if (!Precision::IsInfinite(aV2f))
{
aCurS2Bounds[2] = new Geom2d_Line(gp_Pnt2d(aU2f, aV2f), gp_Dir2d(1.0, 0.0));
aCurS2Bounds[2] = new Geom2d_Line(gp_Pnt2d(aU2f, aV2f), gp_Dir2d(gp_Dir2d::D::X));
if (!Precision::IsInfinite(aDelta))
aCurS2Bounds[2] = new Geom2d_TrimmedCurve(aCurS2Bounds[2], 0, aDelta);
}
if (!Precision::IsInfinite(aV2l))
{
aCurS2Bounds[3] = new Geom2d_Line(gp_Pnt2d(aU2l, aV2l), gp_Dir2d(1.0, 0.0));
aCurS2Bounds[3] = new Geom2d_Line(gp_Pnt2d(aU2f, aV2l), gp_Dir2d(gp_Dir2d::D::X));
if (!Precision::IsInfinite(aDelta))
aCurS2Bounds[3] = new Geom2d_TrimmedCurve(aCurS2Bounds[3], 0, aDelta);
}
src/ModelingAlgorithms/TKGeomAlgo/Hatch/Hatch_Hatcher.cxx
+2 -2
View File
@@ -56,7 +56,7 @@ void Hatch_Hatcher::AddLine(const gp_Dir2d& D, const Standard_Real Dist)
void Hatch_Hatcher::AddXLine(const Standard_Real X)
{
gp_Pnt2d O(X, 0);
gp_Dir2d D(0, 1);
gp_Dir2d D(gp_Dir2d::D::Y);
gp_Lin2d L(O, D);
AddLine(L, Hatch_XLINE);
}
@@ -66,7 +66,7 @@ void Hatch_Hatcher::AddXLine(const Standard_Real X)
void Hatch_Hatcher::AddYLine(const Standard_Real Y)
{
gp_Pnt2d O(0, Y);
gp_Dir2d D(1, 0);
gp_Dir2d D(gp_Dir2d::D::X);
gp_Lin2d L(O, D);
AddLine(L, Hatch_YLINE);
}
src/ModelingAlgorithms/TKGeomAlgo/IntWalk/IntWalk_PWalking.cxx
+2 -2
View File
@@ -2171,10 +2171,10 @@ Standard_Boolean IntWalk_PWalking::ExtendLineInCommonZone(
gp_Pnt2d(FirstParams.Value(afirstindex), FirstParams.Value(afirstindex + 1)),
gp_Pnt2d(LastParams.Value(afirstindex), LastParams.Value(afirstindex + 1)));
gp_Dir2d anIsoDir(0, 1);
gp_Dir2d anIsoDir(gp_Dir2d::D::Y);
if ((indexofiso == 1) || (indexofiso == 3))
anIsoDir = gp_Dir2d(1, 0);
anIsoDir = gp_Dir2d(gp_Dir2d::D::X);
if (aTangentZoneDir.SquareMagnitude() > gp::Resolution())
{
src/ModelingAlgorithms/TKGeomAlgo/Intf/Intf_Tool.cxx
+8 -8
View File
@@ -313,7 +313,7 @@ Standard_Integer Intf_Tool::Inters2d(const gp_Hypr2d& theCurv, const Bnd_Box2d&
if (!Domain.IsOpenYmax())
{
gp_Lin2d L1(gp_Pnt2d(0., ymax), gp_Dir2d(-1., 0.));
gp_Lin2d L1(gp_Pnt2d(0., ymax), gp_Dir2d(gp_Dir2d::D::NX));
IntAna2d_AnaIntersection Inters1(theCurv, IntAna2d_Conic(L1));
if (Inters1.IsDone())
{
@@ -336,7 +336,7 @@ Standard_Integer Intf_Tool::Inters2d(const gp_Hypr2d& theCurv, const Bnd_Box2d&
if (!Domain.IsOpenXmin())
{
gp_Lin2d L2(gp_Pnt2d(xmin, 0.), gp_Dir2d(0., -1.));
gp_Lin2d L2(gp_Pnt2d(xmin, 0.), gp_Dir2d(gp_Dir2d::D::NY));
IntAna2d_AnaIntersection Inters2(theCurv, IntAna2d_Conic(L2));
if (Inters2.IsDone())
{
@@ -359,7 +359,7 @@ Standard_Integer Intf_Tool::Inters2d(const gp_Hypr2d& theCurv, const Bnd_Box2d&
if (!Domain.IsOpenYmin())
{
gp_Lin2d L3(gp_Pnt2d(0., ymin), gp_Dir2d(1., 0.));
gp_Lin2d L3(gp_Pnt2d(0., ymin), gp_Dir2d(gp_Dir2d::D::X));
IntAna2d_AnaIntersection Inters3(theCurv, IntAna2d_Conic(L3));
if (Inters3.IsDone())
{
@@ -382,7 +382,7 @@ Standard_Integer Intf_Tool::Inters2d(const gp_Hypr2d& theCurv, const Bnd_Box2d&
if (!Domain.IsOpenXmax())
{
gp_Lin2d L4(gp_Pnt2d(xmax, 0.), gp_Dir2d(0., 1.));
gp_Lin2d L4(gp_Pnt2d(xmax, 0.), gp_Dir2d(gp_Dir2d::D::Y));
IntAna2d_AnaIntersection Inters4(theCurv, IntAna2d_Conic(L4));
if (Inters4.IsDone())
{
@@ -554,7 +554,7 @@ Standard_Integer Intf_Tool::Inters2d(const gp_Parab2d& theCurv, const Bnd_Box2d&
if (!Domain.IsOpenYmax())
{
gp_Lin2d L1(gp_Pnt2d(0., ymax), gp_Dir2d(-1., 0.));
gp_Lin2d L1(gp_Pnt2d(0., ymax), gp_Dir2d(gp_Dir2d::D::NX));
IntAna2d_AnaIntersection Inters1(theCurv, IntAna2d_Conic(L1));
if (Inters1.IsDone())
{
@@ -577,7 +577,7 @@ Standard_Integer Intf_Tool::Inters2d(const gp_Parab2d& theCurv, const Bnd_Box2d&
if (!Domain.IsOpenXmin())
{
gp_Lin2d L2(gp_Pnt2d(xmin, 0.), gp_Dir2d(0., -1.));
gp_Lin2d L2(gp_Pnt2d(xmin, 0.), gp_Dir2d(gp_Dir2d::D::NY));
IntAna2d_AnaIntersection Inters2(theCurv, IntAna2d_Conic(L2));
if (Inters2.IsDone())
{
@@ -600,7 +600,7 @@ Standard_Integer Intf_Tool::Inters2d(const gp_Parab2d& theCurv, const Bnd_Box2d&
if (!Domain.IsOpenYmin())
{
gp_Lin2d L3(gp_Pnt2d(0., ymin), gp_Dir2d(1., 0.));
gp_Lin2d L3(gp_Pnt2d(0., ymin), gp_Dir2d(gp_Dir2d::D::X));
IntAna2d_AnaIntersection Inters3(theCurv, IntAna2d_Conic(L3));
if (Inters3.IsDone())
{
@@ -623,7 +623,7 @@ Standard_Integer Intf_Tool::Inters2d(const gp_Parab2d& theCurv, const Bnd_Box2d&
if (!Domain.IsOpenXmax())
{
gp_Lin2d L4(gp_Pnt2d(xmax, 0.), gp_Dir2d(0., 1.));
gp_Lin2d L4(gp_Pnt2d(xmax, 0.), gp_Dir2d(gp_Dir2d::D::Y));
IntAna2d_AnaIntersection Inters4(theCurv, IntAna2d_Conic(L4));
if (Inters4.IsDone())
{
src/ModelingAlgorithms/TKHLR/Contap/Contap_ArcFunction.cxx
+1 -1
View File
@@ -24,7 +24,7 @@
Contap_ArcFunction::Contap_ArcFunction()
: myMean(1.),
myType(Contap_ContourStd),
myDir(0., 0., 1.),
myDir(gp_Dir::D::Z),
myCosAng(0.0)
{
}
src/ModelingAlgorithms/TKHLR/Contap/Contap_SurfFunction.cxx
+1 -1
View File
@@ -29,7 +29,7 @@
Contap_SurfFunction::Contap_SurfFunction()
: myMean(1.),
myType(Contap_ContourStd),
myDir(0., 0., 1.),
myDir(gp_Dir::D::Z),
myAng(0.0),
myCosAng(0.), // PI/2 - Angle de depouille
tol(1.e-6),
src/ModelingAlgorithms/TKHLR/HLRAlgo/HLRAlgo_Projector.cxx
+1 -1
View File
@@ -353,7 +353,7 @@ gp_Lin HLRAlgo_Projector::Shoot(const Standard_Real X, const Standard_Real Y) co
}
else
{
L = gp_Lin(gp_Pnt(X, Y, 0), gp_Dir(0, 0, -1));
L = gp_Lin(gp_Pnt(X, Y, 0), gp_Dir(gp_Dir::D::NZ));
}
L.Transform(myInvTrsf);
return L;
src/ModelingAlgorithms/TKHLR/HLRBRep/HLRBRep_Data.cxx
+2 -2
View File
@@ -1536,7 +1536,7 @@ void HLRBRep_Data::EdgeState(const Standard_Real p1,
}
else
{
V = gp_Dir(0, 0, -1);
V = gp_Dir(gp_Dir::D::NZ);
}
V.Transform(TI);
if (NrmFace.Dot(V) > 0.)
@@ -1717,7 +1717,7 @@ Standard_Boolean HLRBRep_Data::OrientOutLine(const Standard_Integer I, HLRBRep_F
}
else
{
V = gp_Dir(0, 0, -1);
V = gp_Dir(gp_Dir::D::NZ);
}
V.Transform(TI);
if (mySLProps.IsNormalDefined())
src/ModelingAlgorithms/TKHLR/HLRTopoBRep/HLRTopoBRep_FaceIsoLiner.cxx
+2 -2
View File
@@ -182,7 +182,7 @@ void HLRTopoBRep_FaceIsoLiner::Perform(const Standard_Integer FI,
if (StepU > Confusion)
{
Standard_Real UPrm = UMin + StepU / 2.;
gp_Dir2d Dir(0., 1.);
gp_Dir2d Dir(gp_Dir2d::D::Y);
for (IIso = 1; IIso <= nbIsos; IIso++)
{
@@ -286,7 +286,7 @@ void HLRTopoBRep_FaceIsoLiner::Perform(const Standard_Integer FI,
if (StepV > Confusion)
{
Standard_Real VPrm = VMin + StepV / 2.;
gp_Dir2d Dir(1., 0.);
gp_Dir2d Dir(gp_Dir2d::D::X);
for (IIso = 1; IIso <= nbIsos; IIso++)
{
src/ModelingAlgorithms/TKHelix/GTests/HelixBRep_BuilderHelix_Integration_Test.cxx
+1 -1
View File
@@ -34,7 +34,7 @@ protected:
void SetUp() override
{
// Standard axis aligned with Z
myAxis = gp_Ax3(gp_Pnt(0., 0., 0.), gp_Dir(0., 0., 1.), gp_Dir(1., 0., 0.));
myAxis = gp_Ax3(gp_Pnt(0., 0., 0.), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X));
myTolerance = 1.e-4;
}
src/ModelingAlgorithms/TKHelix/GTests/HelixBRep_BuilderHelix_Test.cxx
+3 -3
View File
@@ -45,7 +45,7 @@ protected:
void SetUp() override
{
// Default axis setup
myAxis = gp_Ax3(gp_Pnt(0., 0., 0.), gp_Dir(0., 0., 1.), gp_Dir(1., 0., 0.));
myAxis = gp_Ax3(gp_Pnt(0., 0., 0.), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X));
myTolerance = 1.e-4;
}
@@ -167,7 +167,7 @@ TEST_F(TKHelixTest, HelixGeomBuilderHelix_SingleCoil)
{
HelixGeom_BuilderHelix aBuilder;
gp_Ax2 aPosition(gp_Pnt(0., 0., 0.), gp_Dir(0., 0., 1.), gp_Dir(1., 0., 0.));
gp_Ax2 aPosition(gp_Pnt(0., 0., 0.), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X));
aBuilder.SetPosition(aPosition);
aBuilder.SetTolerance(myTolerance);
aBuilder.SetCurveParameters(0.0, 2.0 * M_PI, 10.0, 5.0, 0.0, Standard_True);
@@ -184,7 +184,7 @@ TEST_F(TKHelixTest, HelixGeomBuilderHelix_MultipleCoils)
{
HelixGeom_BuilderHelix aBuilder;
gp_Ax2 aPosition(gp_Pnt(0., 0., 0.), gp_Dir(0., 0., 1.), gp_Dir(1., 0., 0.));
gp_Ax2 aPosition(gp_Pnt(0., 0., 0.), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X));
aBuilder.SetPosition(aPosition);
aBuilder.SetTolerance(myTolerance);
src/ModelingAlgorithms/TKHelix/GTests/HelixGeom_BuilderHelix_Test.cxx
+3 -3
View File
@@ -31,7 +31,7 @@ TEST_F(HelixGeom_BuilderHelix_Test, SingleCoil)
{
HelixGeom_BuilderHelix aBuilder;
gp_Ax2 aPosition(gp_Pnt(0., 0., 0.), gp_Dir(0., 0., 1.), gp_Dir(1., 0., 0.));
gp_Ax2 aPosition(gp_Pnt(0., 0., 0.), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X));
aBuilder.SetPosition(aPosition);
aBuilder.SetTolerance(myTolerance);
aBuilder.SetCurveParameters(0.0, 2.0 * M_PI, 10.0, 5.0, 0.0, Standard_True);
@@ -48,7 +48,7 @@ TEST_F(HelixGeom_BuilderHelix_Test, MultipleCoils)
{
HelixGeom_BuilderHelix aBuilder;
gp_Ax2 aPosition(gp_Pnt(0., 0., 0.), gp_Dir(0., 0., 1.), gp_Dir(1., 0., 0.));
gp_Ax2 aPosition(gp_Pnt(0., 0., 0.), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X));
aBuilder.SetPosition(aPosition);
aBuilder.SetTolerance(myTolerance);
@@ -67,7 +67,7 @@ TEST_F(HelixGeom_BuilderHelix_Test, PositionGetterSetter)
{
HelixGeom_BuilderHelix aBuilder;
gp_Ax2 aTestPosition(gp_Pnt(10., 20., 30.), gp_Dir(1., 0., 0.), gp_Dir(0., 1., 0.));
gp_Ax2 aTestPosition(gp_Pnt(10., 20., 30.), gp_Dir(gp_Dir::D::X), gp_Dir(gp_Dir::D::Y));
aBuilder.SetPosition(aTestPosition);
const gp_Ax2& aRetrievedPosition = aBuilder.Position();
src/ModelingAlgorithms/TKOffset/BRepOffset/BRepOffset_Inter2d.cxx
+4 -4
View File
@@ -1206,22 +1206,22 @@ Standard_Boolean BRepOffset_Inter2d::ExtentEdge(const TopoDS_Edge& E,
TColGeom2d_SequenceOfCurve BoundLines;
if (!Precision::IsInfinite(Vmin))
{
Handle(Geom2d_Line) aLine = new Geom2d_Line(gp_Pnt2d(0., Vmin), gp_Dir2d(1., 0.));
Handle(Geom2d_Line) aLine = new Geom2d_Line(gp_Pnt2d(0., Vmin), gp_Dir2d(gp_Dir2d::D::X));
BoundLines.Append(aLine);
}
if (!Precision::IsInfinite(Umin))
{
Handle(Geom2d_Line) aLine = new Geom2d_Line(gp_Pnt2d(Umin, 0.), gp_Dir2d(0., 1.));
Handle(Geom2d_Line) aLine = new Geom2d_Line(gp_Pnt2d(Umin, 0.), gp_Dir2d(gp_Dir2d::D::Y));
BoundLines.Append(aLine);
}
if (!Precision::IsInfinite(Vmax))
{
Handle(Geom2d_Line) aLine = new Geom2d_Line(gp_Pnt2d(0., Vmax), gp_Dir2d(1., 0.));
Handle(Geom2d_Line) aLine = new Geom2d_Line(gp_Pnt2d(0., Vmax), gp_Dir2d(gp_Dir2d::D::X));
BoundLines.Append(aLine);
}
if (!Precision::IsInfinite(Umax))
{
Handle(Geom2d_Line) aLine = new Geom2d_Line(gp_Pnt2d(Umax, 0.), gp_Dir2d(0., 1.));
Handle(Geom2d_Line) aLine = new Geom2d_Line(gp_Pnt2d(Umax, 0.), gp_Dir2d(gp_Dir2d::D::Y));
BoundLines.Append(aLine);
}
src/ModelingAlgorithms/TKOffset/BRepOffset/BRepOffset_MakeOffset.cxx
+6 -6
View File
@@ -3340,10 +3340,10 @@ void BRepOffset_MakeOffset::MakeMissingWalls(const Message_ProgressRange& theRan
if (!IsPlanar)
{
TopLoc_Location Loc;
EdgeLine2d = new Geom2d_Line(gp_Pnt2d(0., 0.), gp_Dir2d(1., 0.));
EdgeLine2d = new Geom2d_Line(gp_Pnt2d(0., 0.), gp_Dir2d(gp_Dir2d::D::X));
BB.UpdateEdge(anEdge, EdgeLine2d, theSurf, Loc, Precision::Confusion());
Standard_Real Coeff = (OffsetDir * CircAxisDir > 0.) ? 1. : -1.;
OELine2d = new Geom2d_Line(gp_Pnt2d(0., OffsetVal * Coeff), gp_Dir2d(1., 0.));
OELine2d = new Geom2d_Line(gp_Pnt2d(0., OffsetVal * Coeff), gp_Dir2d(gp_Dir2d::D::X));
BB.UpdateEdge(OE, OELine2d, theSurf, Loc, Precision::Confusion());
aLine2d = new Geom2d_Line(gp_Pnt2d(ParV2, 0.), gp_Dir2d(0., Coeff));
aLine2d2 = new Geom2d_Line(gp_Pnt2d(ParV1, 0.), gp_Dir2d(0., Coeff));
@@ -3427,14 +3427,14 @@ void BRepOffset_MakeOffset::MakeMissingWalls(const Message_ProgressRange& theRan
Standard_Real Uf, Ul, Vf, Vl;
theSurf->Bounds(Uf, Ul, Vf, Vl);
TopLoc_Location Loc;
EdgeLine2d = new Geom2d_Line(gp_Pnt2d(0., Vf), gp_Dir2d(1., 0.));
EdgeLine2d = new Geom2d_Line(gp_Pnt2d(0., Vf), gp_Dir2d(gp_Dir2d::D::X));
BB.UpdateEdge(anEdge, EdgeLine2d, theSurf, Loc, Precision::Confusion());
OELine2d = new Geom2d_Line(gp_Pnt2d(0., Vl), gp_Dir2d(1., 0.));
OELine2d = new Geom2d_Line(gp_Pnt2d(0., Vl), gp_Dir2d(gp_Dir2d::D::X));
BB.UpdateEdge(OE, OELine2d, theSurf, Loc, Precision::Confusion());
Standard_Real UonV1 = (ToReverse) ? Ul : Uf;
Standard_Real UonV2 = (ToReverse) ? Uf : Ul;
aLine2d = new Geom2d_Line(gp_Pnt2d(UonV2, 0.), gp_Dir2d(0., 1.));
aLine2d2 = new Geom2d_Line(gp_Pnt2d(UonV1, 0.), gp_Dir2d(0., 1.));
aLine2d = new Geom2d_Line(gp_Pnt2d(UonV2, 0.), gp_Dir2d(gp_Dir2d::D::Y));
aLine2d2 = new Geom2d_Line(gp_Pnt2d(UonV1, 0.), gp_Dir2d(gp_Dir2d::D::Y));
if (E3.IsSame(E4))
{
BB.UpdateEdge(E3, aLine2d, aLine2d2, theSurf, Loc, Precision::Confusion());
src/ModelingAlgorithms/TKOffset/BRepOffset/BRepOffset_MakeSimpleOffset.cxx
+4 -4
View File
@@ -582,14 +582,14 @@ TopoDS_Face BRepOffset_MakeSimpleOffset::BuildWallFace(const TopoDS_Edge& theOri
theSurf->Bounds(Uf, Ul, Vf, Vl);
TopLoc_Location Loc;
Handle(Geom2d_Line) EdgeLine2d, OELine2d, aLine2d, aLine2d2;
EdgeLine2d = new Geom2d_Line(gp_Pnt2d(0., Vf), gp_Dir2d(1., 0.));
EdgeLine2d = new Geom2d_Line(gp_Pnt2d(0., Vf), gp_Dir2d(gp_Dir2d::D::X));
aBB.UpdateEdge(theOrigEdge, EdgeLine2d, theSurf, Loc, Precision::Confusion());
OELine2d = new Geom2d_Line(gp_Pnt2d(0., Vl), gp_Dir2d(1., 0.));
OELine2d = new Geom2d_Line(gp_Pnt2d(0., Vl), gp_Dir2d(gp_Dir2d::D::X));
aBB.UpdateEdge(aNewEdge, OELine2d, theSurf, Loc, Precision::Confusion());
Standard_Real UonV1 = (ToReverse) ? Ul : Uf;
Standard_Real UonV2 = (ToReverse) ? Uf : Ul;
aLine2d = new Geom2d_Line(gp_Pnt2d(UonV2, 0.), gp_Dir2d(0., 1.));
aLine2d2 = new Geom2d_Line(gp_Pnt2d(UonV1, 0.), gp_Dir2d(0., 1.));
aLine2d = new Geom2d_Line(gp_Pnt2d(UonV2, 0.), gp_Dir2d(gp_Dir2d::D::Y));
aLine2d2 = new Geom2d_Line(gp_Pnt2d(UonV1, 0.), gp_Dir2d(gp_Dir2d::D::Y));
if (aWall1.IsSame(aWall2))
{
aBB.UpdateEdge(aWall1, aLine2d, aLine2d2, theSurf, Loc, Precision::Confusion());
src/ModelingAlgorithms/TKOffset/BRepOffset/BRepOffset_Offset.cxx
+12 -12
View File
@@ -1125,7 +1125,7 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
Handle(Geom2d_Curve) PC;
if (ExchUV)
{
PC = new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(1, 0));
PC = new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(gp_Dir2d::D::X));
U1 = f1;
U2 = l1;
if (!C1is3D)
@@ -1133,7 +1133,7 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
}
else
{
PC = new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(0, 1));
PC = new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(gp_Dir2d::D::Y));
U1 = f2;
U2 = l2;
if (!C1is3D)
@@ -1172,7 +1172,7 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
// Update de edge2. (Rem : has already a 3d curve)
if (ExchUV)
{
PC = new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(1, 0));
PC = new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(gp_Dir2d::D::X));
U1 = f1;
U2 = l1;
if (!C2is3D)
@@ -1180,7 +1180,7 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
}
else
{
PC = new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(0, 1));
PC = new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(gp_Dir2d::D::Y));
U1 = f2;
U2 = l2;
if (!C2is3D)
@@ -1275,15 +1275,15 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
{
// rem : si ExchUv, il faut reverser le Wire.
// donc l'edge Forward dans la face sera E4 : d'ou L1 et L2
L2 = new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(0, 1));
L1 = new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(0, 1));
L2 = new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(gp_Dir2d::D::Y));
L1 = new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(gp_Dir2d::D::Y));
U1 = f2;
U2 = l2;
}
else
{
L1 = new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(1, 0));
L2 = new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(1, 0));
L1 = new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(gp_Dir2d::D::X));
L2 = new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(gp_Dir2d::D::X));
U1 = f1;
U2 = l1;
}
@@ -1340,13 +1340,13 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
if (ExchUV)
{
L1 = new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(0, 1));
L1 = new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(gp_Dir2d::D::Y));
U1 = f2;
U2 = l2;
}
else
{
L1 = new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(1, 0));
L1 = new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(gp_Dir2d::D::X));
U1 = f1;
U2 = l1;
}
@@ -1366,13 +1366,13 @@ void BRepOffset_Offset::Init(const TopoDS_Edge& Path,
if (ExchUV)
{
L2 = new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(0, 1));
L2 = new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(gp_Dir2d::D::Y));
U1 = f2;
U2 = l2;
}
else
{
L2 = new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(1, 0));
L2 = new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(gp_Dir2d::D::X));
U1 = f1;
U2 = l1;
}
src/ModelingAlgorithms/TKOffset/BRepOffset/BRepOffset_Tool.cxx
+4 -4
View File
@@ -2618,13 +2618,13 @@ static void MakeFace(const Handle(Geom_Surface)& S,
// make the lines
Handle(Geom2d_Line) Lumin, Lumax, Lvmin, Lvmax;
if (!umininf)
Lumin = new Geom2d_Line(gp_Pnt2d(UMin, 0), gp_Dir2d(0, 1));
Lumin = new Geom2d_Line(gp_Pnt2d(UMin, 0), gp_Dir2d(gp_Dir2d::D::Y));
if (!umaxinf)
Lumax = new Geom2d_Line(gp_Pnt2d(UMax, 0), gp_Dir2d(0, 1));
Lumax = new Geom2d_Line(gp_Pnt2d(UMax, 0), gp_Dir2d(gp_Dir2d::D::Y));
if (!vmininf)
Lvmin = new Geom2d_Line(gp_Pnt2d(0, VMin), gp_Dir2d(1, 0));
Lvmin = new Geom2d_Line(gp_Pnt2d(0, VMin), gp_Dir2d(gp_Dir2d::D::X));
if (!vmaxinf)
Lvmax = new Geom2d_Line(gp_Pnt2d(0, VMax), gp_Dir2d(1, 0));
Lvmax = new Geom2d_Line(gp_Pnt2d(0, VMax), gp_Dir2d(gp_Dir2d::D::X));
Handle(Geom_Curve) Cumin, Cumax, Cvmin, Cvmax;
Standard_Real TolApex = 1.e-5;
src/ModelingAlgorithms/TKOffset/BRepOffsetAPI/BRepOffsetAPI_ThruSections.cxx
+8 -8
View File
@@ -906,8 +906,8 @@ void BRepOffsetAPI_ThruSections::CreateSmoothed()
if (vClosed)
{
B.UpdateEdge(edge1,
new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(1, 0)),
new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(1, 0)),
new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(gp_Dir2d::D::X)),
new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(gp_Dir2d::D::X)),
face,
Precision::Confusion());
B.Range(edge1, face, f1, l1);
@@ -915,12 +915,12 @@ void BRepOffsetAPI_ThruSections::CreateSmoothed()
else
{
B.UpdateEdge(edge1,
new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(1, 0)),
new Geom2d_Line(gp_Pnt2d(0, f2), gp_Dir2d(gp_Dir2d::D::X)),
face,
Precision::Confusion());
B.Range(edge1, face, f1, l1);
B.UpdateEdge(edge2,
new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(1, 0)),
new Geom2d_Line(gp_Pnt2d(0, l2), gp_Dir2d(gp_Dir2d::D::X)),
face,
Precision::Confusion());
B.Range(edge2, face, f1, l1);
@@ -929,8 +929,8 @@ void BRepOffsetAPI_ThruSections::CreateSmoothed()
if (uClosed && nbEdges == 1)
{
B.UpdateEdge(edge3,
new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(0, 1)),
new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(0, 1)),
new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(gp_Dir2d::D::Y)),
new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(gp_Dir2d::D::Y)),
face,
Precision::Confusion());
B.Range(edge3, face, f2, l2);
@@ -938,12 +938,12 @@ void BRepOffsetAPI_ThruSections::CreateSmoothed()
else
{
B.UpdateEdge(edge3,
new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(0, 1)),
new Geom2d_Line(gp_Pnt2d(f1, 0), gp_Dir2d(gp_Dir2d::D::Y)),
face,
Precision::Confusion());
B.Range(edge3, face, f2, l2);
B.UpdateEdge(edge4,
new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(0, 1)),
new Geom2d_Line(gp_Pnt2d(l1, 0), gp_Dir2d(gp_Dir2d::D::Y)),
face,
Precision::Confusion());
B.Range(edge4, face, f2, l2);
src/ModelingAlgorithms/TKPrim/BRepPrim/BRepPrim_Cone.cxx
+2 -2
View File
@@ -65,7 +65,7 @@ BRepPrim_Cone::BRepPrim_Cone(const Standard_Real Angle)
//=================================================================================================
BRepPrim_Cone::BRepPrim_Cone(const Standard_Real Angle, const gp_Pnt& Apex)
: BRepPrim_Revolution(gp_Ax2(Apex, gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)), 0, RealLast()),
: BRepPrim_Revolution(gp_Ax2(Apex, gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)), 0, RealLast()),
myHalfAngle(Angle),
myRadius(0.)
{
@@ -102,7 +102,7 @@ BRepPrim_Cone::BRepPrim_Cone(const gp_Pnt& Center,
const Standard_Real R1,
const Standard_Real R2,
const Standard_Real H)
: BRepPrim_Revolution(gp_Ax2(Center, gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)), 0, 0)
: BRepPrim_Revolution(gp_Ax2(Center, gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)), 0, 0)
{
SetParameters(R1, R2, H);
SetMeridian();
src/ModelingAlgorithms/TKPrim/BRepPrim/BRepPrim_Cylinder.cxx
+3 -3
View File
@@ -48,7 +48,7 @@ BRepPrim_Cylinder::BRepPrim_Cylinder(const Standard_Real Radius)
//=================================================================================================
BRepPrim_Cylinder::BRepPrim_Cylinder(const gp_Pnt& Center, const Standard_Real Radius)
: BRepPrim_Revolution(gp_Ax2(Center, gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)),
: BRepPrim_Revolution(gp_Ax2(Center, gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)),
RealFirst(),
RealLast()),
myRadius(Radius)
@@ -79,7 +79,7 @@ BRepPrim_Cylinder::BRepPrim_Cylinder(const Standard_Real R, const Standard_Real
BRepPrim_Cylinder::BRepPrim_Cylinder(const gp_Pnt& Center,
const Standard_Real R,
const Standard_Real H)
: BRepPrim_Revolution(gp_Ax2(Center, gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)), 0, H),
: BRepPrim_Revolution(gp_Ax2(Center, gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)), 0, H),
myRadius(R)
{
SetMeridian();
@@ -104,6 +104,6 @@ void BRepPrim_Cylinder::SetMeridian()
gp_Ax1 A = Axes().Axis();
A.Translate(V);
Handle(Geom_Line) L = new Geom_Line(A);
Handle(Geom2d_Line) L2d = new Geom2d_Line(gp_Pnt2d(myRadius, 0), gp_Dir2d(0, 1));
Handle(Geom2d_Line) L2d = new Geom2d_Line(gp_Pnt2d(myRadius, 0), gp_Dir2d(gp_Dir2d::D::Y));
Meridian(L, L2d);
}
src/ModelingAlgorithms/TKPrim/BRepPrim/BRepPrim_FaceBuilder.cxx
+4 -4
View File
@@ -102,13 +102,13 @@ void BRepPrim_FaceBuilder::Init(const BRep_Builder& B,
// set the pcurves
Handle(Geom2d_Line) L;
L = new Geom2d_Line(gp_Pnt2d(UMin, VMin), gp_Dir2d(1, 0));
L = new Geom2d_Line(gp_Pnt2d(UMin, VMin), gp_Dir2d(gp_Dir2d::D::X));
B.UpdateEdge(myEdges[0], L, myFace, Precision::Confusion());
L = new Geom2d_Line(gp_Pnt2d(UMax, VMin), gp_Dir2d(0, 1));
L = new Geom2d_Line(gp_Pnt2d(UMax, VMin), gp_Dir2d(gp_Dir2d::D::Y));
B.UpdateEdge(myEdges[1], L, myFace, Precision::Confusion());
L = new Geom2d_Line(gp_Pnt2d(UMax, VMax), gp_Dir2d(-1, 0));
L = new Geom2d_Line(gp_Pnt2d(UMax, VMax), gp_Dir2d(gp_Dir2d::D::NX));
B.UpdateEdge(myEdges[2], L, myFace, Precision::Confusion());
L = new Geom2d_Line(gp_Pnt2d(UMin, VMax), gp_Dir2d(0, -1));
L = new Geom2d_Line(gp_Pnt2d(UMin, VMax), gp_Dir2d(gp_Dir2d::D::NY));
B.UpdateEdge(myEdges[3], L, myFace, Precision::Confusion());
// set the parameters
src/ModelingAlgorithms/TKPrim/BRepPrim/BRepPrim_OneAxis.cxx
+32 -26
View File
@@ -296,8 +296,8 @@ const TopoDS_Face& BRepPrim_OneAxis::LateralFace()
// closed edge
myBuilder.SetPCurve(myEdges[ETOP],
myFaces[FLATERAL],
gp_Lin2d(gp_Pnt2d(0, myVMin), gp_Dir2d(1, 0)),
gp_Lin2d(gp_Pnt2d(0, myVMax), gp_Dir2d(1, 0)));
gp_Lin2d(gp_Pnt2d(0, myVMin), gp_Dir2d(gp_Dir2d::D::X)),
gp_Lin2d(gp_Pnt2d(0, myVMax), gp_Dir2d(gp_Dir2d::D::X)));
}
else
{
@@ -305,7 +305,7 @@ const TopoDS_Face& BRepPrim_OneAxis::LateralFace()
{
myBuilder.SetPCurve(myEdges[ETOP],
myFaces[FLATERAL],
gp_Lin2d(gp_Pnt2d(0, myVMax), gp_Dir2d(1, 0)));
gp_Lin2d(gp_Pnt2d(0, myVMax), gp_Dir2d(gp_Dir2d::D::X)));
if (!HasSides() || MeridianOnAxis(myVMax))
{
// closed edge set parameters
@@ -316,7 +316,7 @@ const TopoDS_Face& BRepPrim_OneAxis::LateralFace()
{
myBuilder.SetPCurve(myEdges[EBOTTOM],
myFaces[FLATERAL],
gp_Lin2d(gp_Pnt2d(0, myVMin), gp_Dir2d(1, 0)));
gp_Lin2d(gp_Pnt2d(0, myVMin), gp_Dir2d(gp_Dir2d::D::X)));
if (!HasSides() || MeridianOnAxis(myVMin))
{
// closed edge set parameters
@@ -328,19 +328,19 @@ const TopoDS_Face& BRepPrim_OneAxis::LateralFace()
{
myBuilder.SetPCurve(myEdges[ESTART],
myFaces[FLATERAL],
gp_Lin2d(gp_Pnt2d(0, -myMeridianOffset), gp_Dir2d(0, 1)));
gp_Lin2d(gp_Pnt2d(0, -myMeridianOffset), gp_Dir2d(gp_Dir2d::D::Y)));
myBuilder.SetPCurve(myEdges[EEND],
myFaces[FLATERAL],
gp_Lin2d(gp_Pnt2d(myAngle, -myMeridianOffset), gp_Dir2d(0, 1)));
gp_Lin2d(gp_Pnt2d(myAngle, -myMeridianOffset), gp_Dir2d(gp_Dir2d::D::Y)));
}
else
{
// closed edge
myBuilder.SetPCurve(myEdges[ESTART],
myFaces[FLATERAL],
gp_Lin2d(gp_Pnt2d(myAngle, -myMeridianOffset), gp_Dir2d(0, 1)),
gp_Lin2d(gp_Pnt2d(0, -myMeridianOffset), gp_Dir2d(0, 1)));
gp_Lin2d(gp_Pnt2d(myAngle, -myMeridianOffset), gp_Dir2d(gp_Dir2d::D::Y)),
gp_Lin2d(gp_Pnt2d(0, -myMeridianOffset), gp_Dir2d(gp_Dir2d::D::Y)));
}
myBuilder.CompleteFace(myFaces[FLATERAL]);
FacesBuilt[FLATERAL] = Standard_True;
@@ -373,12 +373,12 @@ const TopoDS_Face& BRepPrim_OneAxis::TopFace()
myBuilder.SetPCurve(
myEdges[ETOP],
myFaces[FTOP],
gp_Circ2d(gp_Ax2d(gp_Pnt2d(0, 0), gp_Dir2d(1, 0)), MeridianValue(myVMax).X()));
gp_Circ2d(gp_Ax2d(gp_Pnt2d(0, 0), gp_Dir2d(gp_Dir2d::D::X)), MeridianValue(myVMax).X()));
if (HasSides())
{
myBuilder.SetPCurve(myEdges[ETOPSTART],
myFaces[FTOP],
gp_Lin2d(gp_Pnt2d(0, 0), gp_Dir2d(1, 0)));
gp_Lin2d(gp_Pnt2d(0, 0), gp_Dir2d(gp_Dir2d::D::X)));
myBuilder.SetPCurve(myEdges[ETOPEND],
myFaces[FTOP],
gp_Lin2d(gp_Pnt2d(0, 0), gp_Dir2d(Cos(myAngle), Sin(myAngle))));
@@ -414,12 +414,12 @@ const TopoDS_Face& BRepPrim_OneAxis::BottomFace()
myBuilder.SetPCurve(
myEdges[EBOTTOM],
myFaces[FBOTTOM],
gp_Circ2d(gp_Ax2d(gp_Pnt2d(0, 0), gp_Dir2d(1, 0)), MeridianValue(myVMin).X()));
gp_Circ2d(gp_Ax2d(gp_Pnt2d(0, 0), gp_Dir2d(gp_Dir2d::D::X)), MeridianValue(myVMin).X()));
if (HasSides())
{
myBuilder.SetPCurve(myEdges[EBOTSTART],
myFaces[FBOTTOM],
gp_Lin2d(gp_Pnt2d(0, 0), gp_Dir2d(1, 0)));
gp_Lin2d(gp_Pnt2d(0, 0), gp_Dir2d(gp_Dir2d::D::X)));
myBuilder.SetPCurve(myEdges[EBOTEND],
myFaces[FBOTTOM],
gp_Lin2d(gp_Pnt2d(0, 0), gp_Dir2d(Cos(myAngle), Sin(myAngle))));
@@ -456,15 +456,17 @@ const TopoDS_Face& BRepPrim_OneAxis::StartFace()
if (EdgesBuilt[EAXIS])
myBuilder.SetPCurve(myEdges[EAXIS],
myFaces[FSTART],
gp_Lin2d(gp_Pnt2d(0, 0), gp_Dir2d(0, 1)));
gp_Lin2d(gp_Pnt2d(0, 0), gp_Dir2d(gp_Dir2d::D::Y)));
if (EdgesBuilt[ETOPSTART])
myBuilder.SetPCurve(myEdges[ETOPSTART],
myFaces[FSTART],
gp_Lin2d(gp_Pnt2d(0, MeridianValue(myVMax).Y()), gp_Dir2d(1, 0)));
myBuilder.SetPCurve(
myEdges[ETOPSTART],
myFaces[FSTART],
gp_Lin2d(gp_Pnt2d(0, MeridianValue(myVMax).Y()), gp_Dir2d(gp_Dir2d::D::X)));
if (EdgesBuilt[EBOTSTART])
myBuilder.SetPCurve(myEdges[EBOTSTART],
myFaces[FSTART],
gp_Lin2d(gp_Pnt2d(0, MeridianValue(myVMin).Y()), gp_Dir2d(1, 0)));
myBuilder.SetPCurve(
myEdges[EBOTSTART],
myFaces[FSTART],
gp_Lin2d(gp_Pnt2d(0, MeridianValue(myVMin).Y()), gp_Dir2d(gp_Dir2d::D::X)));
myBuilder.CompleteFace(myFaces[FSTART]);
FacesBuilt[FSTART] = Standard_True;
@@ -496,15 +498,19 @@ const TopoDS_Face& BRepPrim_OneAxis::EndFace()
// parametric curves
SetMeridianPCurve(myEdges[EEND], myFaces[FEND]);
if (EdgesBuilt[EAXIS])
myBuilder.SetPCurve(myEdges[EAXIS], myFaces[FEND], gp_Lin2d(gp_Pnt2d(0, 0), gp_Dir2d(0, 1)));
myBuilder.SetPCurve(myEdges[EAXIS],
myFaces[FEND],
gp_Lin2d(gp_Pnt2d(0, 0), gp_Dir2d(gp_Dir2d::D::Y)));
if (EdgesBuilt[ETOPEND])
myBuilder.SetPCurve(myEdges[ETOPEND],
myFaces[FEND],
gp_Lin2d(gp_Pnt2d(0, MeridianValue(myVMax).Y()), gp_Dir2d(1, 0)));
myBuilder.SetPCurve(
myEdges[ETOPEND],
myFaces[FEND],
gp_Lin2d(gp_Pnt2d(0, MeridianValue(myVMax).Y()), gp_Dir2d(gp_Dir2d::D::X)));
if (EdgesBuilt[EBOTEND])
myBuilder.SetPCurve(myEdges[EBOTEND],
myFaces[FEND],
gp_Lin2d(gp_Pnt2d(0, MeridianValue(myVMin).Y()), gp_Dir2d(1, 0)));
myBuilder.SetPCurve(
myEdges[EBOTEND],
myFaces[FEND],
gp_Lin2d(gp_Pnt2d(0, MeridianValue(myVMin).Y()), gp_Dir2d(gp_Dir2d::D::X)));
myBuilder.CompleteFace(myFaces[FEND]);
FacesBuilt[FEND] = Standard_True;
src/ModelingAlgorithms/TKPrim/BRepPrim/BRepPrim_Sphere.cxx
+4 -3
View File
@@ -41,7 +41,7 @@ BRepPrim_Sphere::BRepPrim_Sphere(const Standard_Real Radius)
//=================================================================================================
BRepPrim_Sphere::BRepPrim_Sphere(const gp_Pnt& Center, const Standard_Real Radius)
: BRepPrim_Revolution(gp_Ax2(Center, gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)), PMIN, PMAX),
: BRepPrim_Revolution(gp_Ax2(Center, gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)), PMIN, PMAX),
myRadius(Radius)
{
SetMeridian();
@@ -78,7 +78,8 @@ void BRepPrim_Sphere::SetMeridian()
gp_Dir D = Axes().YDirection();
D.Reverse();
gp_Ax2 A(Axes().Location(), D, Axes().XDirection());
Handle(Geom_Circle) C = new Geom_Circle(A, myRadius);
Handle(Geom2d_Circle) C2d = new Geom2d_Circle(gp_Ax2d(gp_Pnt2d(0, 0), gp_Dir2d(1, 0)), myRadius);
Handle(Geom_Circle) C = new Geom_Circle(A, myRadius);
Handle(Geom2d_Circle) C2d =
new Geom2d_Circle(gp_Ax2d(gp_Pnt2d(0, 0), gp_Dir2d(gp_Dir2d::D::X)), myRadius);
Meridian(C, C2d);
}
src/ModelingAlgorithms/TKPrim/BRepPrim/BRepPrim_Torus.cxx
+2 -2
View File
@@ -53,7 +53,7 @@ BRepPrim_Torus::BRepPrim_Torus(const Standard_Real Major, const Standard_Real Mi
BRepPrim_Torus::BRepPrim_Torus(const gp_Pnt& Center,
const Standard_Real Major,
const Standard_Real Minor)
: BRepPrim_Revolution(gp_Ax2(Center, gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)), 0, 2 * M_PI),
: BRepPrim_Revolution(gp_Ax2(Center, gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)), 0, 2 * M_PI),
myMajor(Major),
myMinor(Minor)
{
@@ -82,6 +82,6 @@ void BRepPrim_Torus::SetMeridian()
A.Translate(V);
Handle(Geom_Circle) C = new Geom_Circle(A, myMinor);
Handle(Geom2d_Circle) C2d =
new Geom2d_Circle(gp_Ax2d(gp_Pnt2d(myMajor, 0), gp_Dir2d(1, 0)), myMinor);
new Geom2d_Circle(gp_Ax2d(gp_Pnt2d(myMajor, 0), gp_Dir2d(gp_Dir2d::D::X)), myMinor);
Meridian(C, C2d);
}
src/ModelingAlgorithms/TKPrim/BRepPrimAPI/BRepPrimAPI_MakeBox.cxx
+14 -13
View File
@@ -42,7 +42,7 @@ inline gp_Pnt pmin(const gp_Pnt& p,
BRepPrimAPI_MakeBox::BRepPrimAPI_MakeBox(const Standard_Real dx,
const Standard_Real dy,
const Standard_Real dz)
: myWedge(gp_Ax2(pmin(gp_Pnt(0, 0, 0), dx, dy, dz), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)),
: myWedge(gp_Ax2(pmin(gp_Pnt(0, 0, 0), dx, dy, dz), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)),
Abs(dx),
Abs(dy),
Abs(dz))
@@ -55,7 +55,7 @@ BRepPrimAPI_MakeBox::BRepPrimAPI_MakeBox(const gp_Pnt& P,
const Standard_Real dx,
const Standard_Real dy,
const Standard_Real dz)
: myWedge(gp_Ax2(pmin(P, dx, dy, dz), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)),
: myWedge(gp_Ax2(pmin(P, dx, dy, dz), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)),
Abs(dx),
Abs(dy),
Abs(dz))
@@ -70,7 +70,7 @@ inline gp_Pnt pmin(const gp_Pnt& p1, const gp_Pnt& p2)
}
BRepPrimAPI_MakeBox::BRepPrimAPI_MakeBox(const gp_Pnt& P1, const gp_Pnt& P2)
: myWedge(gp_Ax2(pmin(P1, P2), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)),
: myWedge(gp_Ax2(pmin(P1, P2), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)),
Abs(P2.X() - P1.X()),
Abs(P2.Y() - P1.Y()),
Abs(P2.Z() - P1.Z()))
@@ -94,7 +94,7 @@ void BRepPrimAPI_MakeBox::Init(const Standard_Real theDX,
const Standard_Real theDZ)
{
myWedge = BRepPrim_Wedge(
gp_Ax2(pmin(gp_Pnt(0, 0, 0), theDX, theDY, theDZ), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)),
gp_Ax2(pmin(gp_Pnt(0, 0, 0), theDX, theDY, theDZ), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)),
Abs(theDX),
Abs(theDY),
Abs(theDZ));
@@ -107,21 +107,22 @@ void BRepPrimAPI_MakeBox::Init(const gp_Pnt& thePnt,
const Standard_Real theDY,
const Standard_Real theDZ)
{
myWedge =
BRepPrim_Wedge(gp_Ax2(pmin(thePnt, theDX, theDY, theDZ), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)),
Abs(theDX),
Abs(theDY),
Abs(theDZ));
myWedge = BRepPrim_Wedge(
gp_Ax2(pmin(thePnt, theDX, theDY, theDZ), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)),
Abs(theDX),
Abs(theDY),
Abs(theDZ));
}
//=================================================================================================
void BRepPrimAPI_MakeBox::Init(const gp_Pnt& thePnt1, const gp_Pnt& thePnt2)
{
myWedge = BRepPrim_Wedge(gp_Ax2(pmin(thePnt1, thePnt2), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)),
Abs(thePnt2.X() - thePnt1.X()),
Abs(thePnt2.Y() - thePnt1.Y()),
Abs(thePnt2.Z() - thePnt1.Z()));
myWedge =
BRepPrim_Wedge(gp_Ax2(pmin(thePnt1, thePnt2), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)),
Abs(thePnt2.X() - thePnt1.X()),
Abs(thePnt2.Y() - thePnt1.Y()),
Abs(thePnt2.Z() - thePnt1.Z()));
}
//=================================================================================================
src/ModelingAlgorithms/TKPrim/BRepPrimAPI/BRepPrimAPI_MakeRevolution.cxx
+3 -3
View File
@@ -52,7 +52,7 @@ BRepPrimAPI_MakeRevolution::BRepPrimAPI_MakeRevolution(const Handle(Geom_Curve)&
BRepPrimAPI_MakeRevolution::BRepPrimAPI_MakeRevolution(const Handle(Geom_Curve)& Meridian,
const Standard_Real angle)
: myRevolution(gp_Ax2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)),
: myRevolution(gp_Ax2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)),
Meridian->FirstParameter(),
Meridian->LastParameter(),
Meridian,
@@ -66,7 +66,7 @@ BRepPrimAPI_MakeRevolution::BRepPrimAPI_MakeRevolution(const Handle(Geom_Curve)&
BRepPrimAPI_MakeRevolution::BRepPrimAPI_MakeRevolution(const Handle(Geom_Curve)& Meridian,
const Standard_Real VMin,
const Standard_Real VMax)
: myRevolution(gp_Ax2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)),
: myRevolution(gp_Ax2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)),
VMin,
VMax,
Meridian,
@@ -80,7 +80,7 @@ BRepPrimAPI_MakeRevolution::BRepPrimAPI_MakeRevolution(const Handle(Geom_Curve)&
const Standard_Real VMin,
const Standard_Real VMax,
const Standard_Real angle)
: myRevolution(gp_Ax2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)),
: myRevolution(gp_Ax2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)),
VMin,
VMax,
Meridian,
src/ModelingAlgorithms/TKPrim/BRepPrimAPI/BRepPrimAPI_MakeSphere.cxx
+4 -4
View File
@@ -63,7 +63,7 @@ BRepPrimAPI_MakeSphere::BRepPrimAPI_MakeSphere(const Standard_Real R,
//=================================================================================================
BRepPrimAPI_MakeSphere::BRepPrimAPI_MakeSphere(const gp_Pnt& Center, const Standard_Real R)
: mySphere(gp_Ax2(Center, gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)), R)
: mySphere(gp_Ax2(Center, gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)), R)
{
}
@@ -72,7 +72,7 @@ BRepPrimAPI_MakeSphere::BRepPrimAPI_MakeSphere(const gp_Pnt& Center, const Stand
BRepPrimAPI_MakeSphere::BRepPrimAPI_MakeSphere(const gp_Pnt& Center,
const Standard_Real R,
const Standard_Real angle)
: mySphere(gp_Ax2(Center, gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)), R)
: mySphere(gp_Ax2(Center, gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)), R)
{
mySphere.Angle(angle);
}
@@ -83,7 +83,7 @@ BRepPrimAPI_MakeSphere::BRepPrimAPI_MakeSphere(const gp_Pnt& Center,
const Standard_Real R,
const Standard_Real angle1,
const Standard_Real angle2)
: mySphere(gp_Ax2(Center, gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)), R)
: mySphere(gp_Ax2(Center, gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)), R)
{
mySphere.VMin(angle1);
mySphere.VMax(angle2);
@@ -96,7 +96,7 @@ BRepPrimAPI_MakeSphere::BRepPrimAPI_MakeSphere(const gp_Pnt& Center,
const Standard_Real angle1,
const Standard_Real angle2,
const Standard_Real angle3)
: mySphere(gp_Ax2(Center, gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)), R)
: mySphere(gp_Ax2(Center, gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)), R)
{
mySphere.VMin(angle1);
mySphere.VMax(angle2);
src/ModelingAlgorithms/TKPrim/BRepPrimAPI/BRepPrimAPI_MakeWedge.cxx
+2 -2
View File
@@ -26,7 +26,7 @@ BRepPrimAPI_MakeWedge::BRepPrimAPI_MakeWedge(const Standard_Real dx,
const Standard_Real dy,
const Standard_Real dz,
const Standard_Real ltx)
: myWedge(gp_Ax2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)), dx, dy, dz, ltx)
: myWedge(gp_Ax2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)), dx, dy, dz, ltx)
{
}
@@ -50,7 +50,7 @@ BRepPrimAPI_MakeWedge::BRepPrimAPI_MakeWedge(const Standard_Real dx,
const Standard_Real zmin,
const Standard_Real xmax,
const Standard_Real zmax)
: myWedge(gp_Ax2(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0)),
: myWedge(gp_Ax2(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X)),
0,
0,
0,
src/ModelingAlgorithms/TKPrim/BRepSweep/BRepSweep_Translation.cxx
+2 -2
View File
@@ -350,7 +350,7 @@ void BRepSweep_Translation::SetGeneratingPCurve(const TopoDS_Shape& aNewFace,
if (aDirV.Index() == 2)
v = -myVec.Magnitude();
L.SetLocation(gp_Pnt2d(0, v));
L.SetDirection(gp_Dir2d(1, 0));
L.SetDirection(gp_Dir2d(gp_Dir2d::D::X));
// }
Handle(Geom2d_Line) GL = new Geom2d_Line(L);
SetThePCurve(myBuilder.Builder(), TopoDS::Edge(aNewEdge), TopoDS::Face(aNewFace), orien, GL);
@@ -372,7 +372,7 @@ void BRepSweep_Translation::SetDirectingPCurve(const TopoDS_Shape& aNewFace,
if (AS.GetType() != GeomAbs_Plane)
{
L.SetLocation(gp_Pnt2d(BRep_Tool::Parameter(TopoDS::Vertex(aGenV), TopoDS::Edge(aGenE)), 0));
L.SetDirection(gp_Dir2d(0, -1));
L.SetDirection(gp_Dir2d(gp_Dir2d::D::NY));
/* JAG
}
else{
src/ModelingAlgorithms/TKShHealing/GTests/ShapeAnalysis_CanonicalRecognition_Test.cxx
+14 -14
View File
@@ -141,7 +141,7 @@ TEST_F(CanonicalRecognitionApproxTest, ConicalSurfaceRecognition_A3)
{
// Create conical face: cone with half angle 30 degrees
const Standard_Real aHalfAngle = M_PI / 6.0; // 30 degrees
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
Handle(Geom_ConicalSurface) aConeSurf = new Geom_ConicalSurface(aAxis, aHalfAngle, 2.0);
BRepBuilderAPI_MakeFace aFaceMaker(aConeSurf, 0, 2 * M_PI, 0, 3, Precision::Confusion());
@@ -167,7 +167,7 @@ TEST_F(CanonicalRecognitionApproxTest, ConicalSurfaceRecognition_A3)
TEST_F(CanonicalRecognitionApproxTest, SphericalSurfaceRecognition_A4)
{
// Create spherical face
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
Handle(Geom_SphericalSurface) aSphereSurf = new Geom_SphericalSurface(aAxis, 1.0);
BRepBuilderAPI_MakeFace aFaceMaker(aSphereSurf, 0, 2 * M_PI, 0, M_PI / 2, Precision::Confusion());
@@ -262,7 +262,7 @@ TEST_F(CanonicalRecognitionBaseCurveTest, BezierToCircleRecognition_A2)
TEST_F(CanonicalRecognitionBaseCurveTest, EllipseToEllipseRecognition_A3)
{
// Create ellipse with major radius 1, minor radius 0.5
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X));
Handle(Geom_Ellipse) aEllipse = new Geom_Ellipse(aAxis, 1.0, 0.5);
// Convert to B-spline curve
@@ -322,7 +322,7 @@ TEST_F(CanonicalRecognitionBaseCurveTest, MultiSegmentWireToLineRecognition_A4)
TEST_F(CanonicalRecognitionBaseCurveTest, MultiSegmentCircleWireRecognition_A5)
{
// Create circle and convert to B-spline
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
Handle(Geom_Circle) aCircle = new Geom_Circle(aAxis, 1.0);
// Convert to B-spline curve
@@ -358,7 +358,7 @@ TEST_F(CanonicalRecognitionBaseCurveTest, MultiSegmentCircleWireRecognition_A5)
TEST_F(CanonicalRecognitionBaseCurveTest, MultiSegmentEllipseWireRecognition_A6)
{
// Create ellipse and convert to B-spline
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1), gp_Dir(1, 0, 0));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z), gp_Dir(gp_Dir::D::X));
Handle(Geom_Ellipse) aEllipse = new Geom_Ellipse(aAxis, 1.0, 0.5);
// Convert to B-spline curve
@@ -440,7 +440,7 @@ TEST_F(CanonicalRecognitionBaseSurfaceTest, TrimmedPlaneRecognition_B1)
TEST_F(CanonicalRecognitionBaseSurfaceTest, TrimmedCylinderRecognition_B2)
{
// Create cylindrical surface
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
Handle(Geom_CylindricalSurface) aCylSurf = new Geom_CylindricalSurface(aAxis, 1.0);
// Create face from cylinder
@@ -467,7 +467,7 @@ TEST_F(CanonicalRecognitionBaseSurfaceTest, TrimmedConeRecognition_B3)
{
// Create conical surface (30 degree half-angle)
const Standard_Real aSemiAngle = M_PI / 6.0; // 30 degrees
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
Handle(Geom_ConicalSurface) aConeSurf = new Geom_ConicalSurface(aAxis, aSemiAngle, 0);
// Create face from cone
@@ -493,7 +493,7 @@ TEST_F(CanonicalRecognitionBaseSurfaceTest, TrimmedConeRecognition_B3)
TEST_F(CanonicalRecognitionBaseSurfaceTest, ConvertedSphereRecognition_B4)
{
// Create spherical surface and convert to B-spline
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
Handle(Geom_SphericalSurface) aSphereSurf = new Geom_SphericalSurface(aAxis, 1.0);
// Convert to B-spline surface
@@ -559,7 +559,7 @@ TEST_F(CanonicalRecognitionBaseSurfaceTest, SewnPlanarSurfaceRecognition_B5)
TEST_F(CanonicalRecognitionBaseSurfaceTest, SewnCylindricalSurfaceRecognition_B6)
{
// Create 4 cylindrical face segments to be sewn together
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
Handle(Geom_CylindricalSurface) aCylSurf = new Geom_CylindricalSurface(aAxis, 1.0);
BRepBuilderAPI_MakeFace aFaceMaker1(aCylSurf, 0, 3, -1, 0, Precision::Confusion());
@@ -601,7 +601,7 @@ TEST_F(CanonicalRecognitionBaseSurfaceTest, SewnConicalSurfaceRecognition_B7)
{
// Create 4 conical face segments to be sewn together
const Standard_Real aSemiAngle = M_PI / 6.0; // 30 degrees
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
Handle(Geom_ConicalSurface) aConeSurf = new Geom_ConicalSurface(aAxis, aSemiAngle, 0);
BRepBuilderAPI_MakeFace aFaceMaker1(aConeSurf, 0, 3, 0, 1, Precision::Confusion());
@@ -642,7 +642,7 @@ TEST_F(CanonicalRecognitionBaseSurfaceTest, SewnConicalSurfaceRecognition_B7)
TEST_F(CanonicalRecognitionBaseSurfaceTest, SewnSphericalSurfaceRecognition_B8)
{
// Create 4 spherical face segments to be sewn together, converted to B-spline
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
Handle(Geom_SphericalSurface) aSphereSurf = new Geom_SphericalSurface(aAxis, 1.0);
// Convert to B-spline surface
@@ -681,7 +681,7 @@ TEST_F(CanonicalRecognitionBaseSurfaceTest, SewnSphericalSurfaceRecognition_B8)
TEST_F(CanonicalRecognitionBaseSurfaceTest, ComplexCylindricalRecognitionWithSection_B9)
{
// Create 4 cylindrical face segments and sew them together
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
Handle(Geom_CylindricalSurface) aCylSurf = new Geom_CylindricalSurface(aAxis, 1.0);
// Create 4 face segments with parameter ranges matching the original test
@@ -726,7 +726,7 @@ TEST_F(CanonicalRecognitionBaseSurfaceTest, ComplexCylindricalRecognitionWithSec
TEST_F(CanonicalRecognitionBaseSurfaceTest, ExtrudedCylindricalSurfaceRecognition_B10)
{
// Create cylindrical surface (radius 1)
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(0, 0, 1));
gp_Ax2 aAxis(gp_Pnt(0, 0, 0), gp_Dir(gp_Dir::D::Z));
Handle(Geom_CylindricalSurface) aCylSurf = new Geom_CylindricalSurface(aAxis, 1.0);
// Create plane for intersection: plane at origin with normal (1, 0, 1) normalized
@@ -745,7 +745,7 @@ TEST_F(CanonicalRecognitionBaseSurfaceTest, ExtrudedCylindricalSurfaceRecognitio
ASSERT_FALSE(anIntCurve.IsNull()) << "Intersection curve is null";
// Create a surface of linear extrusion from the intersection curve
gp_Dir anExtrusionDir(0, 0, 1);
gp_Dir anExtrusionDir(gp_Dir::D::Z);
Handle(Geom_SurfaceOfLinearExtrusion) anExtSurf =
new Geom_SurfaceOfLinearExtrusion(anIntCurve, anExtrusionDir);
src/ModelingAlgorithms/TKShHealing/ShapeBuild/ShapeBuild_Edge.cxx
+1 -1
View File
@@ -585,7 +585,7 @@ Handle(Geom2d_Curve) ShapeBuild_Edge::TransformPCurve(const Handle(Geom2d_Curve)
Handle(Geom2d_BSplineCurve) aBSpline2d;
if (result->IsKind(STANDARD_TYPE(Geom2d_Conic)))
{
// gp_Pln pln(gp_Pnt(0,0,0),gp_Dir(0,0,1));
// gp_Pln pln(gp_Pnt(0,0,0),gp_Dir(gp_Dir::D::Z));
// Handle(Geom_Curve) curve = GeomAPI::To3d(result,pln);
// clang-format off
Handle(Geom2d_Curve) tcurve = new Geom2d_TrimmedCurve(result,aFirst,aLast); //protection against parabols ets
src/ModelingAlgorithms/TKShHealing/ShapeFix/ShapeFix_ComposeShell.cxx
+2 -2
View File
@@ -2031,7 +2031,7 @@ void ShapeFix_ComposeShell::SplitByGrid(ShapeFix_SequenceOfWireSegment& seqw)
// clang-format off
gp_Pnt2d pos ( myGrid->UJointValue(i), 0. ); // 0. - for infinite ranges: myGrid->VJointValue(1) ;
// clang-format on
gp_Lin2d line(pos, gp_Dir2d(0., 1.));
gp_Lin2d line(pos, gp_Dir2d(gp_Dir2d::D::Y));
if (!myClosedMode && myUClosed)
{
Standard_Real period = Umax - Umin;
@@ -2053,7 +2053,7 @@ void ShapeFix_ComposeShell::SplitByGrid(ShapeFix_SequenceOfWireSegment& seqw)
for (i = (myVClosed ? 1 : 2); i <= myGrid->NbVPatches(); i++)
{
gp_Pnt2d pos(0., myGrid->VJointValue(i));
gp_Lin2d line(pos, gp_Dir2d(1., 0.));
gp_Lin2d line(pos, gp_Dir2d(gp_Dir2d::D::X));
if (!myClosedMode && myVClosed)
{
Standard_Real period = Vmax - Vmin;
src/ModelingAlgorithms/TKShHealing/ShapeFix/ShapeFix_EdgeProjAux.cxx
+2 -2
View File
@@ -140,8 +140,8 @@ Standard_Boolean ShapeFix_EdgeProjAux::IsIso(const Handle(Geom2d_Curve)& /*theCu
Handle(Geom2d_Line) theLine2d = Handle(Geom2d_Line)::DownCast(theCurve2d);
gp_Dir2d theDir2d = theLine2d->Direction();
gp_Dir2d dir1(0.,1.);
gp_Dir2d dir2(0.,-1.);
gp_Dir2d dir1(gp_Dir2d::D::Y);
gp_Dir2d dir2(gp_Dir2d::D::NY);
return (theDir2d.IsEqual(dir1,Precision::Angular()) ||
theDir2d.IsEqual(dir2,Precision::Angular()) ||

Some files were not shown because too many files have changed in this diff Show More