From 976ff82f2e510717d27db3da139e2b7921672c19 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 3 Mar 2021 12:09:53 +0100 Subject: [PATCH] missing files last commit --- src/common/plugins/interfaces/decorate_plugin.h | 12 ++++++------ src/common/plugins/interfaces/filter_plugin.h | 16 ++++++++-------- .../filter_mutualinfo/filter_mutualinfo.cpp | 6 +++--- .../filter_mutualinfo/filter_mutualinfo.h | 4 ++-- .../filter_screened_poisson.cpp | 6 +++--- .../filter_screened_poisson.h | 4 ++-- 6 files changed, 24 insertions(+), 24 deletions(-) diff --git a/src/common/plugins/interfaces/decorate_plugin.h b/src/common/plugins/interfaces/decorate_plugin.h index 411c75ac2..6a07dfec6 100644 --- a/src/common/plugins/interfaces/decorate_plugin.h +++ b/src/common/plugins/interfaces/decorate_plugin.h @@ -73,8 +73,8 @@ public: /** The very short string (a few words) describing each filtering action // This string is used also to define the menu entry */ - virtual QString decorationName(FilterIDType) const = 0; - virtual QString decorationInfo(FilterIDType) const = 0; + virtual QString decorationName(ActionIDType) const = 0; + virtual QString decorationInfo(ActionIDType) const = 0; virtual QString decorationName(const QAction *a) const { return decorationName(ID(a)); } virtual QString decorationInfo(const QAction *a) const { return decorationInfo(ID(a)); } @@ -100,15 +100,15 @@ public: virtual int getDecorationClass(const QAction *) const = 0; virtual QList actions() const { return actionList; } - virtual QList types() const { return typeList; } + virtual QList types() const { return typeList; } virtual QAction *action(QString name) const; protected: QList actionList; - QList typeList; - virtual FilterIDType ID(const QAction *a) const; - virtual FilterIDType ID(QString name) const; + QList typeList; + virtual ActionIDType ID(const QAction *a) const; + virtual ActionIDType ID(QString name) const; }; #define DECORATE_PLUGIN_IID "vcg.meshlab.DecoratePlugin/1.0" diff --git a/src/common/plugins/interfaces/filter_plugin.h b/src/common/plugins/interfaces/filter_plugin.h index 91878c336..d9f457fc2 100644 --- a/src/common/plugins/interfaces/filter_plugin.h +++ b/src/common/plugins/interfaces/filter_plugin.h @@ -82,7 +82,7 @@ public: * @brief The very short string (a few words) describing each filtering action * This string is used also to define the menu entry */ - virtual QString filterName(FilterIDType) const = 0; + virtual QString filterName(ActionIDType) const = 0; /** * @brief This function returns the name of each filter in python (pymeshlab). @@ -90,7 +90,7 @@ public: * and making it compliant to python style name convention: * python.org/dev/peps/pep-0008/ */ - virtual QString pythonFilterName(FilterIDType f) const; + virtual QString pythonFilterName(ActionIDType f) const; /** * @brief The long, formatted string describing each filtering action. @@ -107,7 +107,7 @@ public: *
* e.g. italic for authors, bold for title (quoted) and plain for bib ref. */ - virtual QString filterInfo(FilterIDType filter) const = 0; + virtual QString filterInfo(ActionIDType filter) const = 0; /** * @brief The FilterClass describes in which generic class of filters it fits. @@ -209,15 +209,15 @@ public: virtual QString filterInfo(const QAction* a) const { return this->filterInfo(ID(a)); } virtual QString filterName(const QAction* a) const { return this->filterName(ID(a)); } virtual QString pythonFilterName(const QAction* a) const {return this->pythonFilterName(ID(a)); } - virtual QString filterScriptFunctionName(FilterIDType /*filterID*/) { return ""; } + virtual QString filterScriptFunctionName(ActionIDType /*filterID*/) { return ""; } - virtual FilterIDType ID(const QAction *a) const; + virtual ActionIDType ID(const QAction *a) const; - virtual QAction* getFilterAction(FilterIDType filterID); + virtual QAction* getFilterAction(ActionIDType filterID); virtual QAction* getFilterAction(const QString& idName); virtual QList actions() const { return actionList; } - virtual QList types() const { return typeList; } + virtual QList types() const { return typeList; } /** * Generate the mask of attributes would be created IF the MeshFilterInterface filt would has been called on MeshModel mm @@ -235,7 +235,7 @@ protected: // The list of actions exported by the plugin. Each actions strictly corresponds to QList actionList; - QList typeList; + QList typeList; // this string is used to pass back to the framework error messages in case of failure of a filter apply. QString errorMessage; diff --git a/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.cpp b/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.cpp index d6f964427..75815d15a 100644 --- a/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.cpp +++ b/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.cpp @@ -38,7 +38,7 @@ FilterMutualInfoPlugin::FilterMutualInfoPlugin() { typeList << FP_IMAGE_MUTUALINFO; - for(FilterIDType tt : types()) + for(ActionIDType tt : types()) actionList << new QAction(filterName(tt), this); } @@ -47,7 +47,7 @@ QString FilterMutualInfoPlugin::pluginName() const return "FilterMutualInfo"; } -QString FilterMutualInfoPlugin::filterName(FilterIDType filterId) const +QString FilterMutualInfoPlugin::filterName(ActionIDType filterId) const { switch(filterId) { case FP_IMAGE_MUTUALINFO: @@ -58,7 +58,7 @@ QString FilterMutualInfoPlugin::filterName(FilterIDType filterId) const } } -QString FilterMutualInfoPlugin::filterInfo(FilterIDType filterId) const +QString FilterMutualInfoPlugin::filterInfo(ActionIDType filterId) const { switch(filterId) { case FP_IMAGE_MUTUALINFO: diff --git a/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.h b/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.h index 7f8409d87..294166cd4 100644 --- a/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.h +++ b/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.h @@ -43,8 +43,8 @@ public: QString pluginName() const; - QString filterName(FilterIDType filter) const; - QString filterInfo(FilterIDType filter) const; + QString filterName(ActionIDType filter) const; + QString filterInfo(ActionIDType filter) const; FilterClass getClass(const QAction* a) const; bool requiresGLContext(const QAction* action) const; FILTER_ARITY filterArity(const QAction*) const; diff --git a/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.cpp b/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.cpp index a930e0ae7..d1f2056fa 100644 --- a/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.cpp +++ b/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.cpp @@ -37,7 +37,7 @@ FilterScreenedPoissonPlugin::FilterScreenedPoissonPlugin() { typeList << FP_SCREENED_POISSON; - for (FilterIDType tt : types()){ + for (ActionIDType tt : types()){ actionList << new QAction(filterName(tt), this); } } @@ -54,7 +54,7 @@ QString FilterScreenedPoissonPlugin::pluginName() const return "FilterScreenedPoisson"; } -QString FilterScreenedPoissonPlugin::filterName(FilterIDType filter) const +QString FilterScreenedPoissonPlugin::filterName(ActionIDType filter) const { if (filter == FP_SCREENED_POISSON) return "Surface Reconstruction: Screened Poisson"; @@ -63,7 +63,7 @@ QString FilterScreenedPoissonPlugin::filterName(FilterIDType filter) const } } -QString FilterScreenedPoissonPlugin::filterInfo(FilterIDType filter) const +QString FilterScreenedPoissonPlugin::filterInfo(ActionIDType filter) const { if (filter == FP_SCREENED_POISSON) return "This surface reconstruction algorithm creates watertight surfaces " diff --git a/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.h b/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.h index 90d080c85..ae8ab1948 100644 --- a/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.h +++ b/src/meshlabplugins/filter_screened_poisson/filter_screened_poisson.h @@ -41,8 +41,8 @@ public: ~FilterScreenedPoissonPlugin(); QString pluginName() const; - QString filterName(FilterIDType filter) const; - QString filterInfo(FilterIDType filter) const; + QString filterName(ActionIDType filter) const; + QString filterInfo(ActionIDType filter) const; FilterClass getClass(const QAction* a) const; int getRequirements(const QAction* a);