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

MeshPart: [skip ci] fix segmentation fault in flatmesh when built with boost.python

Browse Source
This commit is contained in:
wmayer
2020-07-29 13:44:45 +02:00
parent 62a048fa33
commit fd7b228dba
2 changed files with 5 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Mod/MeshPart/App/MeshFlatteningBoostPython.cpp
View File

@@ -100,7 +100,7 @@ boost::shared_ptr<FaceUnwrapper> FaceUnwrapper_mesh(const py::object& points,
ColMat<double, 3> coords;
coords.resize(l1.size(), 3);
int row = 0;
for (Py::Sequence::iterator it = l1.begin(); it != l1.end(); ++it) {
for (Py::Sequence::iterator it = l1.begin(); it != l1.end(); ++it, ++row) {
Py::Sequence c(*it);
int col = 0;
for (Py::Sequence::iterator jt = c.begin(); jt != c.end(); ++jt, ++col) {
@@ -112,7 +112,8 @@ boost::shared_ptr<FaceUnwrapper> FaceUnwrapper_mesh(const py::object& points,
Py::Sequence l2(facets.ptr());
ColMat<long, 3> triangles;
triangles.resize(l2.size(), 3);
for (Py::Sequence::iterator it = l2.begin(); it != l2.end(); ++it) {
row = 0;
for (Py::Sequence::iterator it = l2.begin(); it != l2.end(); ++it, ++row) {
Py::Sequence c(*it);
int col = 0;
for (Py::Sequence::iterator jt = c.begin(); jt != c.end(); ++jt, ++col) {

4
src/Mod/MeshPart/Gui/MeshFlatteningCommand.py
View File

@@ -29,8 +29,8 @@ class CreateFlatMesh(BaseCommand):
flattener = flatmesh.FaceUnwrapper(points, faces)
flattener.findFlatNodes(5, 0.95)
boundaries = flattener.getFlatBoundaryNodes()
print('number of nodes: {}'.format(len(flattener.ze_nodes)))
print('number of faces: {}'.format(len(flattener.tris)))
#print('number of nodes: {}'.format(len(flattener.ze_nodes)))
#print('number of faces: {}'.format(len(flattener.tris)))
wires = []
for edge in boundaries: