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

extend API of smooth command to allow to run different algorithms

Browse Source
This commit is contained in:
wmayer
2018-04-14 18:44:03 +02:00
parent 8a7525f620
commit 4adeb7702d
2 changed files with 33 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/Mod/Mesh/App/MeshPy.xml
View File

@@ -403,7 +403,7 @@ The argument int is the mode: 0=inner, 1=outer
<UserDocu>Fillup holes</UserDocu>
</Documentation>
</Methode>
<Methode Name="smooth" Const="true">
<Methode Name="smooth" Const="true" Keyword="true">
<Documentation>
<UserDocu>Smooth the mesh
smooth([iteration=1,maxError=FLT_MAX])</UserDocu>
@@ -520,7 +520,7 @@ for p in mesh.Facets:
</Attribute>
<ClassDeclarations>private:
friend class PropertyMeshKernel;
class PropertyMeshKernel* parentProperty;
class PropertyMeshKernel* parentProperty = nullptr;
</ClassDeclarations>
</PythonExport>
</GenerateModel>

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

@@ -43,6 +43,7 @@
#include "Core/Grid.h"
#include "Core/MeshKernel.h"
#include "Core/Segmentation.h"
#include "Core/Smoothing.h"
#include "Core/Curvature.h"
#include <boost/algorithm/string.hpp>
@@ -1627,16 +1628,41 @@ PyObject* MeshPy::trim(PyObject *args)
Py_Return;
}
PyObject* MeshPy::smooth(PyObject *args)
PyObject* MeshPy::smooth(PyObject *args, PyObject *kwds)
{
char* method = "Laplace";
int iter=1;
float d_max=FLOAT_MAX;
if (!PyArg_ParseTuple(args, "|if", &iter,&d_max))
return NULL;
double lambda = 0;
double micro = 0;
static char* keywords_smooth[] = {"Method","Iteration","Lambda","Micro",NULL};
if (!PyArg_ParseTupleAndKeywords(args, kwds, "|sidd",keywords_smooth,
&method, &iter, &lambda, &micro))
return 0;
PY_TRY {
MeshPropertyLock lock(this->parentProperty);
getMeshObjectPtr()->smooth(iter, d_max);
MeshCore::MeshKernel& kernel = getMeshObjectPtr()->getKernel();
if (strcmp(method, "Laplace") == 0) {
MeshCore::LaplaceSmoothing smooth(kernel);
if (lambda > 0)
smooth.SetLambda(lambda);
smooth.Smooth(iter);
}
else if (strcmp(method, "Taubin") == 0) {
MeshCore::TaubinSmoothing smooth(kernel);
if (lambda > 0)
smooth.SetLambda(lambda);
if (micro > 0)
smooth.SetMicro(micro);
smooth.Smooth(iter);
}
else if (strcmp(method, "PlaneFit") == 0) {
MeshCore::PlaneFitSmoothing smooth(kernel);
smooth.Smooth(iter);
}
else {
throw Py::ValueError("No such smoothing algorithm");
}
} PY_CATCH;
Py_Return;