From 0e670396fa0665ca7d54e49706bcc9f6f83ec41a Mon Sep 17 00:00:00 2001 From: Przemo Firszt Date: Tue, 5 May 2015 20:25:51 +0100 Subject: [PATCH] FEM: getNodesByFace should return int not long Suggested by wmayer Signed-off-by: Przemo Firszt --- src/Mod/Fem/App/FemMesh.cpp | 7 ++++--- src/Mod/Fem/App/FemMesh.h | 2 +- src/Mod/Fem/App/FemMeshPyImp.cpp | 4 ++-- 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/src/Mod/Fem/App/FemMesh.cpp b/src/Mod/Fem/App/FemMesh.cpp index 75a745c50..15d51153c 100755 --- a/src/Mod/Fem/App/FemMesh.cpp +++ b/src/Mod/Fem/App/FemMesh.cpp @@ -404,9 +404,10 @@ std::set FemMesh::getSurfaceNodes(long ElemId, short FaceId, float Angle) return result; } -std::set FemMesh::getNodesByFace(const TopoDS_Face &face) const { - std::set result; +std::set FemMesh::getNodesByFace(const TopoDS_Face &face) const +{ + std::set result; Bnd_Box box; BRepBndLib::Add(face, box); @@ -1230,4 +1231,4 @@ Base::Quantity FemMesh::getVolume(void)const return Base::Quantity(volume,Unit::Volume); -} \ No newline at end of file +} diff --git a/src/Mod/Fem/App/FemMesh.h b/src/Mod/Fem/App/FemMesh.h index 6a157252c..a7339e83a 100755 --- a/src/Mod/Fem/App/FemMesh.h +++ b/src/Mod/Fem/App/FemMesh.h @@ -88,7 +88,7 @@ public: /// retrieving by region growing std::set getSurfaceNodes(long ElemId, short FaceId, float Angle=360)const; /// retrieving by face - std::set getNodesByFace(const TopoDS_Face &face) const; + std::set getNodesByFace(const TopoDS_Face &face) const; /// retrieving by edge std::set getNodesByEdge(const TopoDS_Edge &edge) const; /// retrieving by vertex diff --git a/src/Mod/Fem/App/FemMeshPyImp.cpp b/src/Mod/Fem/App/FemMeshPyImp.cpp index a96770df9..ec355b4de 100755 --- a/src/Mod/Fem/App/FemMeshPyImp.cpp +++ b/src/Mod/Fem/App/FemMeshPyImp.cpp @@ -547,8 +547,8 @@ PyObject* FemMeshPy::getNodesByFace(PyObject *args) return 0; } Py::List ret; - std::set resultSet = getFemMeshPtr()->getNodesByFace(fc); - for (std::set::const_iterator it = resultSet.begin();it!=resultSet.end();++it) + std::set resultSet = getFemMeshPtr()->getNodesByFace(fc); + for (std::set::const_iterator it = resultSet.begin();it!=resultSet.end();++it) ret.append(Py::Int(*it)); return Py::new_reference_to(ret);