From 52d65e20851b8134680430a92c1cb59f6ef024c6 Mon Sep 17 00:00:00 2001 From: wmayer Date: Sat, 17 Dec 2011 12:58:47 +0000 Subject: [PATCH] + port to OCC 6.5.2 git-svn-id: https://free-cad.svn.sourceforge.net/svnroot/free-cad/trunk@5318 e8eeb9e2-ec13-0410-a4a9-efa5cf37419d --- src/Mod/Part/App/AppPartPy.cpp | 7 ++++++- src/Mod/Part/App/Geometry.cpp | 7 ++++++- src/Mod/Part/App/GeometrySurfacePyImp.cpp | 7 ++++++- src/Mod/Part/App/PrimitiveFeature.cpp | 7 ++++++- src/Mod/Part/App/TopoShape.cpp | 19 ++++++++++++++++--- src/Mod/Part/App/TopoShapeFacePyImp.cpp | 7 ++++++- 6 files changed, 46 insertions(+), 8 deletions(-) diff --git a/src/Mod/Part/App/AppPartPy.cpp b/src/Mod/Part/App/AppPartPy.cpp index 58a64f41e..3ef8072ac 100644 --- a/src/Mod/Part/App/AppPartPy.cpp +++ b/src/Mod/Part/App/AppPartPy.cpp @@ -73,6 +73,7 @@ # include # include # include +# include #endif #include @@ -492,7 +493,11 @@ static PyObject * makePlane(PyObject *self, PyObject *args) d.SetCoord(vec.x, vec.y, vec.z); } Handle_Geom_Plane aPlane = new Geom_Plane(p, d); - BRepBuilderAPI_MakeFace Face(aPlane, 0.0, length, 0.0, width); + BRepBuilderAPI_MakeFace Face(aPlane, 0.0, length, 0.0, width +#if OCC_VERSION_HEX >= 0x060502 + , Precision::Confusion() +#endif + ); return new TopoShapeFacePy(new TopoShape((Face.Face()))); } catch (Standard_DomainError) { diff --git a/src/Mod/Part/App/Geometry.cpp b/src/Mod/Part/App/Geometry.cpp index bd58b321d..7f3b9f71b 100644 --- a/src/Mod/Part/App/Geometry.cpp +++ b/src/Mod/Part/App/Geometry.cpp @@ -66,6 +66,7 @@ # include # include # include +# include # include # include # include @@ -1252,7 +1253,11 @@ TopoDS_Shape GeomSurface::toShape() const Handle_Geom_Surface s = Handle_Geom_Surface::DownCast(handle()); Standard_Real u1,u2,v1,v2; s->Bounds(u1,u2,v1,v2); - BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2); + BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2 +#if OCC_VERSION_HEX >= 0x060502 + , Precision::Confusion() +#endif + ); return mkBuilder.Shape(); } diff --git a/src/Mod/Part/App/GeometrySurfacePyImp.cpp b/src/Mod/Part/App/GeometrySurfacePyImp.cpp index 9f38b2913..d2772205d 100644 --- a/src/Mod/Part/App/GeometrySurfacePyImp.cpp +++ b/src/Mod/Part/App/GeometrySurfacePyImp.cpp @@ -32,6 +32,7 @@ # include # include # include +# include # include #endif @@ -79,7 +80,11 @@ PyObject* GeometrySurfacePy::toShape(PyObject *args) s->Bounds(u1,u2,v1,v2); if (!PyArg_ParseTuple(args, "|dddd", &u1,&u2,&v1,&v2)) return 0; - BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2); + BRepBuilderAPI_MakeFace mkBuilder(s, u1, u2, v1, v2 +#if OCC_VERSION_HEX >= 0x060502 + , Precision::Confusion() +#endif + ); TopoDS_Shape sh = mkBuilder.Shape(); return new TopoShapeFacePy(new TopoShape(sh)); } diff --git a/src/Mod/Part/App/PrimitiveFeature.cpp b/src/Mod/Part/App/PrimitiveFeature.cpp index 2d1bd471f..9a4deb390 100644 --- a/src/Mod/Part/App/PrimitiveFeature.cpp +++ b/src/Mod/Part/App/PrimitiveFeature.cpp @@ -54,6 +54,7 @@ # include # include # include +# include #endif @@ -255,7 +256,11 @@ App::DocumentObjectExecReturn *Plane::execute(void) gp_Pnt pnt(0.0,0.0,0.0); gp_Dir dir(0.0,0.0,1.0); Handle_Geom_Plane aPlane = new Geom_Plane(pnt, dir); - BRepBuilderAPI_MakeFace mkFace(aPlane, 0.0, L, 0.0, W); + BRepBuilderAPI_MakeFace mkFace(aPlane, 0.0, L, 0.0, W +#if OCC_VERSION_HEX >= 0x060502 + , Precision::Confusion() +#endif + ); const char *error=0; switch (mkFace.Error()) diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 4a7bf3c51..0206d8569 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -133,6 +133,7 @@ # include # include # include +# include #endif # include # include @@ -1338,7 +1339,11 @@ TopoDS_Shape TopoShape::makeTube(double radius, double tol) const double u1,u2,v1,v2; surf->Bounds(u1,u2,v1,v2); - BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, v1, v2); + BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, v1, v2 +#if OCC_VERSION_HEX >= 0x060502 + , Precision::Confusion() +#endif + ); return mkBuilder.Face(); } @@ -1391,7 +1396,11 @@ TopoDS_Shape TopoShape::makeTube() const Standard_Real u1,u2,v1,v2; mySurface->Bounds(u1,u2,v1,v2); - BRepBuilderAPI_MakeFace mkBuilder(mySurface, u1, u2, v1, v2); + BRepBuilderAPI_MakeFace mkBuilder(mySurface, u1, u2, v1, v2 +#if OCC_VERSION_HEX >= 0x060502 + , Precision::Confusion() +#endif + ); return mkBuilder.Shape(); } @@ -1443,7 +1452,11 @@ TopoDS_Shape TopoShape::makeSweep(const TopoDS_Shape& profile, double tol, int f mkSweep.Perform(tol, Standard_False, GeomAbs_C1, BSplCLib::MaxDegree(), 1000); const Handle_Geom_Surface& surf = mkSweep.Surface(); - BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, vmin, vmax); + BRepBuilderAPI_MakeFace mkBuilder(surf, umin, umax, vmin, vmax +#if OCC_VERSION_HEX >= 0x060502 + , Precision::Confusion() +#endif + ); return mkBuilder.Face(); } diff --git a/src/Mod/Part/App/TopoShapeFacePyImp.cpp b/src/Mod/Part/App/TopoShapeFacePyImp.cpp index 00f864ff7..60a1e5e5d 100644 --- a/src/Mod/Part/App/TopoShapeFacePyImp.cpp +++ b/src/Mod/Part/App/TopoShapeFacePyImp.cpp @@ -48,6 +48,7 @@ # include # include # include +# include #endif #include @@ -135,7 +136,11 @@ int TopoShapeFacePy::PyInit(PyObject* args, PyObject* /*kwd*/) return -1; } - BRepBuilderAPI_MakeFace mkFace(S); + BRepBuilderAPI_MakeFace mkFace(S +#if OCC_VERSION_HEX >= 0x060502 + , Precision::Confusion() +#endif + ); if (bound) { Py::List list(bound); for (Py::List::iterator it = list.begin(); it != list.end(); ++it) {