OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-09-03 14:10:33 +03:00
Code Activity

0022792: Globally defined symbol PI conflicts with VTK definition (Intel compiler)

Browse Source
This commit is contained in:
DBV
2011-12-16 08:50:03 +00:00
committed by bugmaster
parent bc650d4170
commit c6541a0c86
438 changed files with 2142 additions and 2188 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/GeomToIGES/GeomToIGES_GeomCurve.cxx
View File

@@ -522,7 +522,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomCurve::TransferCurve
//gka BUG 6542 1.09.04 BSpline curve was written in the IGES instead circle.
gp_Pnt pfirst,plast;
start->D0(U1,pfirst);
if(Abs (Ufin - Udeb - 2 * PI) <= Precision::PConfusion())
if(Abs (Ufin - Udeb - 2 * M_PI) <= Precision::PConfusion())
plast = pfirst;
else
start->D0(U2,plast);
@@ -568,12 +568,12 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomCurve::TransferCurve
//#35 rln 22.10.98 BUC60391 face 9
//Closed Conic Arc is incorrectly oriented when reading back to CAS.CADE
if (Abs (Ufin - Udeb - 2 * PI) <= Precision::PConfusion()) {
if (Abs (Ufin - Udeb - 2 * M_PI) <= Precision::PConfusion()) {
//#53 rln 24.12.98 CCI60005
//Trimmed ellipse. To avoid huge weights in B-Spline first rotate it and then convert
Handle(Geom_Ellipse) copystart = Handle(Geom_Ellipse)::DownCast (start->Copy());
gp_Ax2 pos = copystart->Position();
copystart->SetPosition (pos.Rotated (pos.Axis(), gp_Ax3 (pos).Direct() ? Udeb : 2 * PI - Udeb));
copystart->SetPosition (pos.Rotated (pos.Axis(), gp_Ax3 (pos).Direct() ? Udeb : 2 * M_PI - Udeb));
Handle(Geom_BSplineCurve) Bspline;
//:q3 abv 17 Mar 99: use GeomConvert_ApproxCurve for precise conversion
GeomConvert_ApproxCurve approx (copystart, Precision::Approximation(),
@@ -583,7 +583,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomCurve::TransferCurve
GeomConvert::CurveToBSplineCurve (copystart, Convert_QuasiAngular);
TColStd_Array1OfReal Knots(1, Bspline->NbKnots());
Bspline->Knots (Knots);
BSplCLib::Reparametrize (Udeb, Udeb + 2 * PI, Knots);
BSplCLib::Reparametrize (Udeb, Udeb + 2 * M_PI, Knots);
Bspline->SetKnots (Knots);
return TransferCurve (Bspline, Udeb, Ufin);
}

12
src/GeomToIGES/GeomToIGES_GeomSurface.cxx
View File

@@ -582,7 +582,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomSurface::TransferSurface
//Axis->Init(gp_XYZ(0.0, 0.0, 0.0), gp_XYZ(0.0, 0.0, 1.0/GetUnit()));
//Surf->Init (Axis, Generatrix, U1, U2);
Axis->Init(gp_XYZ (0, 0, 1. / GetUnit()), gp_XYZ (0, 0, 0));
Surf->Init (Axis, Generatrix, 2 * PI - U2, 2 * PI - U1);
Surf->Init (Axis, Generatrix, 2 * M_PI - U2, 2 * M_PI - U1);
// creation de la Trsf (#124)
@@ -660,7 +660,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomSurface::TransferSurface
//Axis->Init(gp_XYZ(0.0, 0.0, 0.0), gp_XYZ(0.0, 0.0, 1.0/GetUnit()));
//Surf->Init (Axis, Generatrix, U1, U2);
Axis->Init(gp_XYZ (0, 0, 1. / GetUnit()), gp_XYZ (0, 0, 0));
Surf->Init (Axis, Generatrix, 2 * PI - U2, 2 * PI - U1);
Surf->Init (Axis, Generatrix, 2 * M_PI - U2, 2 * M_PI - U1);
// creation de la Trsf (#124)
@@ -735,7 +735,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomSurface::TransferSurface
if ( Gen->IsKind(STANDARD_TYPE(IGESGeom_CircularArc))) {
//#30 rln 19.10.98 Surf->Init (Axis, Gen, U1, U2);
Surf->Init (Axis, Gen, 2 * PI - U2, 2 * PI - U1);
Surf->Init (Axis, Gen, 2 * M_PI - U2, 2 * M_PI - U1);
IGESConvGeom_GeomBuilder Build;
Standard_Real xloc,yloc,zloc;
start->Sphere().Location().Coord(xloc,yloc,zloc);
@@ -807,7 +807,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomSurface::TransferSurface
//:l6 abv: CTS22022: writing full tori: if ( Gen->IsKind(STANDARD_TYPE(IGESGeom_CircularArc))) {
//#30 rln 19.10.98 Surf->Init (Axis, Gen, U1, U2);
Surf->Init (Axis, Gen, 2 * PI - U2, 2 * PI - U1);
Surf->Init (Axis, Gen, 2 * M_PI - U2, 2 * M_PI - U1);
IGESConvGeom_GeomBuilder Build;
/* //:l6: useless
Standard_Real xloc,yloc,zloc;
@@ -994,7 +994,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomSurface::TransferSurface
Axis->Init(gp_XYZ(X1/GetUnit(),Y1/GetUnit(),Z1/GetUnit()),
gp_XYZ( (X1 - X2) / GetUnit(), (Y1 - Y2) / GetUnit(), (Z1 - Z2) / GetUnit()));
Surf->Init (Axis, Generatrix, 2 * PI - U2, 2 * PI - U1);
Surf->Init (Axis, Generatrix, 2 * M_PI - U2, 2 * M_PI - U1);
res = Surf;
return res;
@@ -1178,7 +1178,7 @@ Handle(IGESData_IGESEntity) GeomToIGES_GeomSurface::TransferConicalSurface(const
Handle(Geom_Direction) rdir = new Geom_Direction(XDir);//XAxe.Direction());
Handle(IGESGeom_Direction) refdir = GV.TransferVector(rdir);
ConSurf->Init (aLocation, Axis, radius, angle*180./PI, refdir);
ConSurf->Init (aLocation, Axis, radius, angle*180./M_PI, refdir);
res = ConSurf;
return res;
}