OpenCascade/occt
1
0
Fork 0
mirror of https://git.dev.opencascade.org/repos/occt.git synced 2025-08-14 13:30:48 +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

2
src/DrawDim/DrawDim.cxx
View File

@@ -59,7 +59,7 @@ void DrawDim::DrawShapeName (const TopoDS_Shape& ashape,
}
else if (curve->IsKind(STANDARD_TYPE(Geom_Circle))) {
parameter = (f+l)/2.;
if (f > l) parameter = parameter + PI;
if (f > l) parameter = parameter + M_PI;
position = ElCLib::Value(parameter,Handle(Geom_Circle)::DownCast(curve)->Circ());
}
}

10
src/DrawDim/DrawDim_PlanarAngle.cxx
View File

@@ -148,15 +148,15 @@ void DrawDim_PlanarAngle::DrawOn(Draw_Display& dis) const
}
if (!parallel && !clockwise) {
p1 = angle;
p2 = PI;
p2 = M_PI;
}
if (parallel && clockwise) {
p1 = PI;
p2 = PI+angle;
p1 = M_PI;
p2 = M_PI+angle;
}
if (!parallel && clockwise) {
p1 = PI+angle;
p2 = 2*PI;
p1 = M_PI+angle;
p2 = 2*M_PI;
}
// affichage
dis.Draw(circle,p1,p2);

2
src/DrawDim/DrawDim_PlanarDiameter.cxx
View File

@@ -57,7 +57,7 @@ void DrawDim_PlanarDiameter::DrawOn(Draw_Display& dis) const
TopExp::Vertices(TopoDS::Edge(myCircle),vf,vl);
const gp_Pnt first = BRep_Tool::Pnt(vf);
Standard_Real parfirst = ElCLib::Parameter(circle,first);
Standard_Real parlast = (parfirst + PI);
Standard_Real parlast = (parfirst + M_PI);
gp_Pnt last = ElCLib::Value(parlast,circle);
//
dis.Draw (first,last);