From f1283cf24c966430b6ebd451805924a7bfd720cd Mon Sep 17 00:00:00 2001 From: Sebastian Hoogen Date: Fri, 10 Oct 2014 22:27:08 +0200 Subject: [PATCH] fixes #1782 remove unused precsion parameters from gp_Trsf::SetValues --- src/Mod/Part/App/GeometryPyImp.cpp | 7 +++++-- src/Mod/Part/App/TopoShape.cpp | 14 ++++++++++---- src/Mod/Sketcher/App/SketchObject.cpp | 8 ++++++-- 3 files changed, 21 insertions(+), 8 deletions(-) diff --git a/src/Mod/Part/App/GeometryPyImp.cpp b/src/Mod/Part/App/GeometryPyImp.cpp index f12a4f687..fb8055842 100644 --- a/src/Mod/Part/App/GeometryPyImp.cpp +++ b/src/Mod/Part/App/GeometryPyImp.cpp @@ -151,8 +151,11 @@ PyObject* GeometryPy::transform(PyObject *args) gp_Trsf trf; trf.SetValues(mat[0][0],mat[0][1],mat[0][2],mat[0][3], mat[1][0],mat[1][1],mat[1][2],mat[1][3], - mat[2][0],mat[2][1],mat[2][2],mat[2][3], - 0.00001,0.00001); + mat[2][0],mat[2][1],mat[2][2],mat[2][3] +#if OCC_VERSION_HEX < 0x060800 + , 0.00001,0.00001 +#endif + ); //precision was removed in OCCT CR0025194 getGeometryPtr()->handle()->Transform(trf); Py_Return; } diff --git a/src/Mod/Part/App/TopoShape.cpp b/src/Mod/Part/App/TopoShape.cpp index 99db84044..c6135df3e 100644 --- a/src/Mod/Part/App/TopoShape.cpp +++ b/src/Mod/Part/App/TopoShape.cpp @@ -453,8 +453,11 @@ void TopoShape::convertTogpTrsf(const Base::Matrix4D& mtrx, gp_Trsf& trsf) { trsf.SetValues(mtrx[0][0],mtrx[0][1],mtrx[0][2],mtrx[0][3], mtrx[1][0],mtrx[1][1],mtrx[1][2],mtrx[1][3], - mtrx[2][0],mtrx[2][1],mtrx[2][2],mtrx[2][3], - 0.00001,0.00001); + mtrx[2][0],mtrx[2][1],mtrx[2][2],mtrx[2][3] +#if OCC_VERSION_HEX < 0x060800 + , 0.00001,0.00001 +#endif + ); //precision was removed in OCCT CR0025194 } void TopoShape::convertToMatrix(const gp_Trsf& trsf, Base::Matrix4D& mtrx) @@ -2043,8 +2046,11 @@ void TopoShape::transformShape(const Base::Matrix4D& rclTrf, bool copy) gp_Trsf mat; mat.SetValues(rclTrf[0][0],rclTrf[0][1],rclTrf[0][2],rclTrf[0][3], rclTrf[1][0],rclTrf[1][1],rclTrf[1][2],rclTrf[1][3], - rclTrf[2][0],rclTrf[2][1],rclTrf[2][2],rclTrf[2][3], - 0.00001,0.00001); + rclTrf[2][0],rclTrf[2][1],rclTrf[2][2],rclTrf[2][3] +#if OCC_VERSION_HEX < 0x060800 + , 0.00001,0.00001 +#endif + ); //precision was removed in OCCT CR0025194 // location transformation BRepBuilderAPI_Transform mkTrf(this->_Shape, mat, copy ? Standard_True : Standard_False); diff --git a/src/Mod/Sketcher/App/SketchObject.cpp b/src/Mod/Sketcher/App/SketchObject.cpp index 3c16a1450..75f76414a 100644 --- a/src/Mod/Sketcher/App/SketchObject.cpp +++ b/src/Mod/Sketcher/App/SketchObject.cpp @@ -39,6 +39,7 @@ # include # include # include +# include #endif #include @@ -1245,8 +1246,11 @@ void SketchObject::rebuildExternalGeometry(void) gp_Trsf mov; mov.SetValues(invMat[0][0],invMat[0][1],invMat[0][2],invMat[0][3], invMat[1][0],invMat[1][1],invMat[1][2],invMat[1][3], - invMat[2][0],invMat[2][1],invMat[2][2],invMat[2][3], - 0.00001,0.00001); + invMat[2][0],invMat[2][1],invMat[2][2],invMat[2][3] +#if OCC_VERSION_HEX < 0x060800 + , 0.00001, 0.00001 +#endif + ); //precision was removed in OCCT CR0025194 gp_Ax3 sketchAx3(gp_Pnt(Pos.x,Pos.y,Pos.z), gp_Dir(dN.x,dN.y,dN.z),