kindred/create
1
1
Fork 0
Code Issues 37 Pull Requests Actions Packages Projects 9 Releases 2 Wiki Activity

Mesh: change MeshSegmentAlgorithm::FindSegments to accept shared instead of raw pointers

Browse Source
This commit is contained in:
wmayer
2020-03-03 12:20:42 +01:00
committed by Bernd Hahnebach
parent 4b77f9f3ac
commit a031816de2
8 changed files with 34 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/Mod/Mesh/App/MeshPyImp.cpp
View File

@@ -1887,7 +1887,7 @@ PyObject* MeshPy::getSegmentsByCurvature(PyObject *args)
meshCurv.ComputePerVertex();
Py::Sequence func(l);
std::vector<MeshCore::MeshSurfaceSegment*> segm;
std::vector<MeshCore::MeshSurfaceSegmentPtr> segm;
for (Py::Sequence::iterator it = func.begin(); it != func.end(); ++it) {
Py::Tuple t(*it);
float c1 = (float)Py::Float(t[0]);
@@ -1899,13 +1899,13 @@ PyObject* MeshPy::getSegmentsByCurvature(PyObject *args)
#else
int num = (int)Py::Int(t[4]);
#endif
segm.push_back(new MeshCore::MeshCurvatureFreeformSegment(meshCurv.GetCurvature(), num, tol1, tol2, c1, c2));
segm.emplace_back(new MeshCore::MeshCurvatureFreeformSegment(meshCurv.GetCurvature(), num, tol1, tol2, c1, c2));
}
finder.FindSegments(segm);
Py::List list;
for (std::vector<MeshCore::MeshSurfaceSegment*>::iterator segmIt = segm.begin(); segmIt != segm.end(); ++segmIt) {
for (std::vector<MeshCore::MeshSurfaceSegmentPtr>::iterator segmIt = segm.begin(); segmIt != segm.end(); ++segmIt) {
const std::vector<MeshCore::MeshSegment>& data = (*segmIt)->GetSegments();
for (std::vector<MeshCore::MeshSegment>::const_iterator it = data.begin(); it != data.end(); ++it) {
Py::List ary;
@@ -1918,7 +1918,6 @@ PyObject* MeshPy::getSegmentsByCurvature(PyObject *args)
}
list.append(ary);
}
delete (*segmIt);
}
return Py::new_reference_to(list);