diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index cd08cb0e4..a15b49484 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -134,36 +134,36 @@ else() meshlabplugins/filter_geodesic meshlabplugins/filter_sample_gpu meshlabplugins/filter_ao - meshlabplugins/filter_camera + #meshlabplugins/filter_camera meshlabplugins/filter_clean - meshlabplugins/filter_color_projection - meshlabplugins/filter_colorproc + #meshlabplugins/filter_color_projection + #meshlabplugins/filter_colorproc meshlabplugins/filter_create - meshlabplugins/filter_csg - meshlabplugins/filter_dirt - meshlabplugins/filter_fractal - meshlabplugins/filter_func - meshlabplugins/filter_img_patch_param - meshlabplugins/filter_isoparametrization - meshlabplugins/filter_layer - meshlabplugins/filter_measure - meshlabplugins/filter_meshing - meshlabplugins/filter_mls - meshlabplugins/filter_mutualglobal - meshlabplugins/filter_mutualinfo - meshlabplugins/filter_plymc - meshlabplugins/filter_qhull - meshlabplugins/filter_quality - meshlabplugins/filter_sampling - meshlabplugins/filter_screened_poisson - meshlabplugins/filter_sdfgpu - meshlabplugins/filter_select - meshlabplugins/filter_sketchfab - meshlabplugins/filter_ssynth - meshlabplugins/filter_texture - meshlabplugins/filter_trioptimize - meshlabplugins/filter_unsharp - meshlabplugins/filter_voronoi + #meshlabplugins/filter_csg + #meshlabplugins/filter_dirt + #meshlabplugins/filter_fractal + #meshlabplugins/filter_func + #meshlabplugins/filter_img_patch_param + #meshlabplugins/filter_isoparametrization + #meshlabplugins/filter_layer + #meshlabplugins/filter_measure + #meshlabplugins/filter_meshing + #meshlabplugins/filter_mls + #meshlabplugins/filter_mutualglobal + #meshlabplugins/filter_mutualinfo + #meshlabplugins/filter_plymc + #meshlabplugins/filter_qhull + #meshlabplugins/filter_quality + #meshlabplugins/filter_sampling + #meshlabplugins/filter_screened_poisson + #meshlabplugins/filter_sdfgpu + #meshlabplugins/filter_select + #meshlabplugins/filter_sketchfab + #meshlabplugins/filter_ssynth + #meshlabplugins/filter_texture + #meshlabplugins/filter_trioptimize + #meshlabplugins/filter_unsharp + #meshlabplugins/filter_voronoi # Rendering and Decoration Plugins meshlabplugins/render_gdp diff --git a/src/common/plugins/interfaces/decorate_plugin.cpp b/src/common/plugins/interfaces/decorate_plugin.cpp index 3ebe12d7c..b4288f19f 100644 --- a/src/common/plugins/interfaces/decorate_plugin.cpp +++ b/src/common/plugins/interfaces/decorate_plugin.cpp @@ -33,10 +33,10 @@ void DecoratePlugin::initGlobalParameterList(const QAction* /*format*/, RichPara QAction* DecoratePlugin::action(QString name) const { QString n = name; - foreach(QAction *tt, actions()) + for(QAction *tt : actions()) if (name == this->decorationName(ID(tt))) return tt; n.replace("&",""); - foreach(QAction *tt, actions()) + for(QAction *tt : actions()) if (n == this->decorationName(ID(tt))) return tt; qDebug("unable to find the id corresponding to action '%s'", qUtf8Printable(name)); diff --git a/src/common/plugins/interfaces/filter_plugin.h b/src/common/plugins/interfaces/filter_plugin.h index 3bddc0535..143756fd0 100644 --- a/src/common/plugins/interfaces/filter_plugin.h +++ b/src/common/plugins/interfaces/filter_plugin.h @@ -219,8 +219,8 @@ public: virtual QAction* getFilterAction(ActionIDType filterID); virtual QAction* getFilterAction(const QString& idName); - virtual QList actions() const { return actionList; } - virtual QList types() const { return typeList; } + virtual std::list actions() const { return actionList; } + virtual std::list types() const { return typeList; } /** * @brief wrongActionCalled throws a MLException. Call this function whenever @@ -241,9 +241,9 @@ protected: // // The list of actions exported by the plugin. Each actions strictly corresponds to - QList actionList; + std::list actionList; - QList typeList; + std::list typeList; }; #define FILTER_PLUGIN_IID "vcg.meshlab.FilterPlugin/1.0" diff --git a/src/common/python/function_set.cpp b/src/common/python/function_set.cpp index 113c01a45..15eff3881 100644 --- a/src/common/python/function_set.cpp +++ b/src/common/python/function_set.cpp @@ -110,8 +110,7 @@ pymeshlab::FunctionSet::FunctionSet(const PluginManager& pm) } for (FilterPlugin* fp : pm.filterPluginIterator()){ - QList acts = fp->actions(); - for (QAction* act : acts) { + for (QAction* act : fp->actions()) { QString originalFilterName = fp->filterName(act); QString description = fp->filterInfo(act); QString pythonFilterName = fp->pythonFilterName(act); diff --git a/src/meshlabplugins/filter_ao/filter_ao.cpp b/src/meshlabplugins/filter_ao/filter_ao.cpp index 0c24fc2ed..ca513133a 100644 --- a/src/meshlabplugins/filter_ao/filter_ao.cpp +++ b/src/meshlabplugins/filter_ao/filter_ao.cpp @@ -45,11 +45,12 @@ static GLuint vs, fs, shdrID; AmbientOcclusionPlugin::AmbientOcclusionPlugin() { - typeList - << FP_AMBIENT_OCCLUSION; + typeList = { + FP_AMBIENT_OCCLUSION + }; - foreach(ActionIDType tt , types()) - actionList << new QAction(filterName(tt), this); + for(ActionIDType tt : types()) + actionList.push_back(new QAction(filterName(tt), this)); init = false; useGPU = AMBOCC_USEGPU_BY_DEFAULT; diff --git a/src/meshlabplugins/filter_clean/cleanfilter.cpp b/src/meshlabplugins/filter_clean/cleanfilter.cpp index 1ab4b6dfb..5ad5a2b00 100644 --- a/src/meshlabplugins/filter_clean/cleanfilter.cpp +++ b/src/meshlabplugins/filter_clean/cleanfilter.cpp @@ -37,29 +37,30 @@ int SnapVertexBorder(CMeshO &m, Scalarm threshold,vcg::CallBackPos * cb); CleanFilter::CleanFilter() { - typeList - << FP_BALL_PIVOTING - << FP_REMOVE_WRT_Q - << FP_REMOVE_ISOLATED_COMPLEXITY - << FP_REMOVE_ISOLATED_DIAMETER - << FP_REMOVE_TVERTEX_FLIP - << FP_REMOVE_TVERTEX_COLLAPSE - << FP_SNAP_MISMATCHED_BORDER - << FP_REMOVE_DUPLICATE_FACE - << FP_REMOVE_FOLD_FACE - << FP_REMOVE_NON_MANIF_EDGE - << FP_REMOVE_NON_MANIF_EDGE_SPLIT - << FP_REMOVE_NON_MANIF_VERT - << FP_REMOVE_UNREFERENCED_VERTEX - << FP_REMOVE_DUPLICATED_VERTEX - << FP_REMOVE_FACE_ZERO_AREA - << FP_MERGE_CLOSE_VERTEX - << FP_MERGE_WEDGE_TEX - << FP_COMPACT_FACE - << FP_COMPACT_VERT; + typeList = { + FP_BALL_PIVOTING, + FP_REMOVE_WRT_Q, + FP_REMOVE_ISOLATED_COMPLEXITY, + FP_REMOVE_ISOLATED_DIAMETER, + FP_REMOVE_TVERTEX_FLIP, + FP_REMOVE_TVERTEX_COLLAPSE, + FP_SNAP_MISMATCHED_BORDER, + FP_REMOVE_DUPLICATE_FACE, + FP_REMOVE_FOLD_FACE, + FP_REMOVE_NON_MANIF_EDGE, + FP_REMOVE_NON_MANIF_EDGE_SPLIT, + FP_REMOVE_NON_MANIF_VERT, + FP_REMOVE_UNREFERENCED_VERTEX, + FP_REMOVE_DUPLICATED_VERTEX, + FP_REMOVE_FACE_ZERO_AREA, + FP_MERGE_CLOSE_VERTEX, + FP_MERGE_WEDGE_TEX, + FP_COMPACT_FACE, + FP_COMPACT_VERT + }; for(ActionIDType tt : types()) - actionList << new QAction(filterName(tt), this); + actionList.push_back(new QAction(filterName(tt), this)); QCoreApplication* app = QCoreApplication::instance(); if (app != nullptr) @@ -67,8 +68,6 @@ CleanFilter::CleanFilter() } CleanFilter::~CleanFilter() { - for (int i = 0; i < actionList.count() ; i++ ) - delete actionList.at(i); } QString CleanFilter::pluginName() const diff --git a/src/meshlabplugins/filter_create/filter_create.cpp b/src/meshlabplugins/filter_create/filter_create.cpp index d3eb80c96..b5d4e7976 100644 --- a/src/meshlabplugins/filter_create/filter_create.cpp +++ b/src/meshlabplugins/filter_create/filter_create.cpp @@ -35,13 +35,23 @@ using namespace tri; FilterCreate::FilterCreate() { - typeList << CR_BOX<< CR_ANNULUS << CR_SPHERE<< CR_SPHERE_CAP - << CR_RANDOM_SPHERE<< CR_ICOSAHEDRON<< CR_DODECAHEDRON - << CR_TETRAHEDRON<