From 15541eb1cdcb2dcd113eccfeb7c5fd9ad65a0ce2 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 4 Nov 2021 16:01:29 +0100 Subject: [PATCH] filter function and texture defragmentation python rename --- .../filter_func/filter_func.cpp | 28 +++++++++++++++++-- src/meshlabplugins/filter_func/filter_func.h | 16 ++++++----- .../filter_texture_defragmentation.cpp | 11 ++++++++ .../filter_texture_defragmentation.h | 1 + 4 files changed, 47 insertions(+), 9 deletions(-) diff --git a/src/meshlabplugins/filter_func/filter_func.cpp b/src/meshlabplugins/filter_func/filter_func.cpp index 6d9f30a6f..9ad5c4980 100644 --- a/src/meshlabplugins/filter_func/filter_func.cpp +++ b/src/meshlabplugins/filter_func/filter_func.cpp @@ -90,9 +90,33 @@ QString FilterFunctionPlugin::filterName(ActionIDType filterId) const case FF_REFINE: return QString("Refine User-Defined"); case FF_ISOSURFACE: return QString("Implicit Surface"); - default: assert(0); + default: assert(0); return QString(); + } +} + +QString FilterFunctionPlugin::pythonFilterName(ActionIDType f) const +{ + switch (f) { + case FF_VERT_SELECTION: return QString("compute_selection_by_condition_per_vertex"); + case FF_FACE_SELECTION: return QString("compute_selection_by_condition_per_face"); + case FF_GEOM_FUNC: return QString("compute_coord_by_function"); + case FF_FACE_COLOR: return QString("compute_color_by_function_per_face"); + case FF_FACE_QUALITY: return QString("compute_scalar_by_function_per_face"); + case FF_VERT_COLOR: return QString("compute_color_by_function_per_vertex"); + case FF_VERT_QUALITY: return QString("compute_scalar_by_function_per_vertex"); + case FF_VERT_TEXTURE_FUNC: return QString("compute_texcoord_by_function_per_vertex"); + case FF_WEDGE_TEXTURE_FUNC: return QString("compute_texcoord_by_function_per_wedge"); + case FF_VERT_NORMAL: return QString("compute_normal_by_function_per_vertex"); + case FF_DEF_VERT_SCALAR_ATTRIB: return QString("compute_new_custom_scalar_attribute_per_vertex"); + case FF_DEF_FACE_SCALAR_ATTRIB: return QString("compute_new_custom_scalar_attribute_per_face"); + case FF_DEF_VERT_POINT_ATTRIB: return QString("compute_new_custom_point_attribute_per_vertex"); + case FF_DEF_FACE_POINT_ATTRIB: return QString("compute_new_custom_point_attribute_per_face"); + case FF_GRID: return QString("create_grid"); + case FF_REFINE: return QString("meshing_refine_by_function"); + case FF_ISOSURFACE: return QString("create_implicit_surface"); + + default: assert(0); return QString(); } - return QString("error!"); } const QString PossibleOperators( diff --git a/src/meshlabplugins/filter_func/filter_func.h b/src/meshlabplugins/filter_func/filter_func.h index 76fc2590f..4f30dd217 100644 --- a/src/meshlabplugins/filter_func/filter_func.h +++ b/src/meshlabplugins/filter_func/filter_func.h @@ -80,13 +80,15 @@ public: FilterFunctionPlugin(); ~FilterFunctionPlugin(); - QString pluginName() const; - QString filterName(ActionIDType filter) const; - QString filterInfo(ActionIDType filter) const; - FilterClass getClass(const QAction*) const; - int postCondition(const QAction* action) const; - RichParameterList initParameterList(const QAction*, const MeshModel& /*m*/); - virtual int getRequirements(const QAction*); + QString pluginName() const; + QString pythonFilterName(ActionIDType f) const; + QString filterName(ActionIDType filter) const; + QString filterInfo(ActionIDType filter) const; + FilterClass getClass(const QAction*) const; + int postCondition(const QAction* action) const; + RichParameterList initParameterList(const QAction*, const MeshModel& /*m*/); + virtual int getRequirements(const QAction*); + std::map applyFilter( const QAction* action, const RichParameterList& parameters, diff --git a/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.cpp b/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.cpp index d5ed08599..968d338f9 100644 --- a/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.cpp +++ b/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.cpp @@ -76,6 +76,17 @@ QString FilterTextureDefragPlugin::filterName(ActionIDType filterId) const return {}; } +QString FilterTextureDefragPlugin::pythonFilterName(ActionIDType f) const +{ + switch(f) { + case FP_TEXTURE_DEFRAG: + return QString("apply_texmap_defragmentation"); + default: + assert(0); return QString(); + } + return {}; +} + QString FilterTextureDefragPlugin::filterInfo(ActionIDType filterId) const { switch(filterId) { diff --git a/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.h b/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.h index 9391b5747..13161e68c 100644 --- a/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.h +++ b/src/meshlabplugins/filter_texture_defragmentation/filter_texture_defragmentation.h @@ -50,6 +50,7 @@ class FilterTextureDefragPlugin : public QObject, public FilterPlugin QString pluginName() const; QString filterName(ActionIDType filter) const; + QString pythonFilterName(ActionIDType f) const; QString filterInfo(ActionIDType filter) const; RichParameterList initParameterList(const QAction*, const MeshDocument &/*m*/); std::map applyFilter(