From 32df9a9aaffe08f3d2ea73e31d73e018735e12a2 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Tue, 2 Feb 2021 12:58:24 +0100 Subject: [PATCH] possibility to check version of plugin and if it has been built with double precision --- src/common/globals.h | 14 ++ src/common/mlapplication.cpp | 6 +- .../interfaces/decorate_plugin_interface.h | 8 +- .../interfaces/edit_plugin_interface.h | 18 +- .../interfaces/filter_plugin_interface.h | 10 +- .../interfaces/iomesh_plugin_interface.h | 10 +- .../interfaces/ioraster_plugin_interface.h | 10 +- .../plugins/interfaces/plugin_interface.h | 10 + .../interfaces/render_plugin_interface.h | 10 +- src/common/plugins/plugin_manager.cpp | 198 +++++++++++------- src/common/plugins/plugin_manager.h | 11 +- .../decorate_background/decorate_background.h | 2 +- .../decorate_base/decorate_base.h | 2 +- .../decorate_shadow/decorate_shadow.h | 2 +- src/meshlabplugins/edit_align/edit_align.h | 3 +- .../edit_align/edit_align_factory.h | 2 +- .../edit_manipulators/edit_manipulators.h | 5 +- .../edit_measure/edit_measure.h | 5 +- .../edit_mutualcorrs/edit_mutualcorrs.h | 1 + src/meshlabplugins/edit_paint/edit_paint.h | 3 +- .../edit_pickpoints/editpickpoints.h | 1 + src/meshlabplugins/edit_point/edit_point.h | 1 + .../edit_quality/qualitymapper.h | 3 +- .../edit_referencing/edit_referencing.h | 1 + src/meshlabplugins/edit_sample/edit_sample.h | 1 + src/meshlabplugins/edit_select/edit_select.h | 9 +- src/meshlabplugins/filter_ao/filter_ao.h | 6 +- .../filter_camera/filter_camera.h | 4 +- src/meshlabplugins/filter_clean/cleanfilter.h | 6 +- .../filter_colorproc/filter_colorproc.h | 6 +- .../filter_create/filter_create.h | 6 +- .../filter_createiso/filter_createiso.h | 6 +- src/meshlabplugins/filter_csg/filter_csg.h | 4 +- src/meshlabplugins/filter_dirt/filter_dirt.h | 4 +- .../filter_fractal/filter_fractal.h | 4 +- .../globalregistration.h | 6 +- .../filter_img_patch_param.h | 6 +- .../filter_isoparametrization.h | 6 +- .../filter_layer/filter_layer.h | 6 +- .../filter_meshing/meshfilter.h | 4 +- .../filter_plymc/filter_plymc.h | 6 +- .../filter_qhull/filter_qhull.h | 6 +- .../filter_quality/filterqualitymapper.h | 6 +- .../filter_sample_dyn/filter_sample_dyn.h | 6 +- .../filter_sampling/filter_sampling.h | 6 +- .../filter_ssynth/filter_ssynth.h | 8 +- .../filter_texture/filter_texture.h | 6 +- src/meshlabplugins/io_3ds/meshio.h | 4 +- src/meshlabplugins/io_base/baseio.h | 4 +- src/meshlabplugins/io_bre/io_bre.h | 6 +- src/meshlabplugins/io_collada/io_collada.h | 6 +- src/meshlabplugins/io_ctm/io_ctm.h | 6 +- src/meshlabplugins/io_expe/io_expe.h | 6 +- src/meshlabplugins/io_pdb/io_pdb.h | 6 +- src/meshlabplugins/io_tri/io_tri.h | 6 +- src/meshlabplugins/io_txt/io_txt.h | 6 +- .../ioraster_base/ioraster_base.h | 4 +- .../radianceScalingRenderer.h | 4 +- 58 files changed, 324 insertions(+), 198 deletions(-) diff --git a/src/common/globals.h b/src/common/globals.h index 8f534fad7..2e1dd37b6 100644 --- a/src/common/globals.h +++ b/src/common/globals.h @@ -24,6 +24,9 @@ #ifndef MESHLAB_GLOBALS_H #define MESHLAB_GLOBALS_H +#define meshlab_xstr(a) mlstringify(a) +#define mlstringify(a) #a + #include class RichParameterList; @@ -37,6 +40,17 @@ QString defaultShadersPath(); RichParameterList& defaultGlobalParameterList(); PluginManager& pluginManagerInstance(); +//keep this functions inlined please +inline std::string meshlabVersion() +{ + return std::string(meshlab_xstr(MESHLAB_VERSION)); +}; + +inline bool builtWithDoublePrecision() +{ + return std::string(meshlab_xstr(MESHLAB_SCALAR)) == std::string("double"); +} + } #endif // MESHLAB_GLOBALS_H diff --git a/src/common/mlapplication.cpp b/src/common/mlapplication.cpp index 45aecef8b..ae86d3638 100644 --- a/src/common/mlapplication.cpp +++ b/src/common/mlapplication.cpp @@ -1,6 +1,7 @@ #include "mlapplication.h" #include "mlexception.h" #include +#include "globals.h" #ifndef MESHLAB_VERSION #define MESHLAB_VERSION 2020.09 @@ -20,9 +21,6 @@ #define ML_COMPILER_VER std::string() #endif -#define xstr(a) stringify(a) -#define stringify(a) #a - #ifdef NDEBUG bool MeshLabApplication::notify( QObject * rec, QEvent * ev ) { @@ -46,7 +44,7 @@ bool MeshLabApplication::notify( QObject * rec, QEvent * ev ) const QString MeshLabApplication::appVer() { - return QString(xstr(MESHLAB_VERSION)); + return QString::fromStdString(meshlab::meshlabVersion()); } const QString MeshLabApplication::compilerVersion() diff --git a/src/common/plugins/interfaces/decorate_plugin_interface.h b/src/common/plugins/interfaces/decorate_plugin_interface.h index bc99ac34a..c9ba0d9f5 100644 --- a/src/common/plugins/interfaces/decorate_plugin_interface.h +++ b/src/common/plugins/interfaces/decorate_plugin_interface.h @@ -112,7 +112,13 @@ protected: virtual FilterIDType ID(QString name) const; }; -#define MESHLAB_PLUGIN_IID_EXPORTER(x) Q_PLUGIN_METADATA(IID x) +#define MESHLAB_PLUGIN_IID_EXPORTER(x) \ + Q_PLUGIN_METADATA(IID x) \ + public: \ + virtual std::pair getMLVersion() const { \ + return std::make_pair(meshlab::meshlabVersion(), meshlab::builtWithDoublePrecision()); \ + } \ + private: #define MESHLAB_PLUGIN_NAME_EXPORTER(x) #define DECORATE_PLUGIN_INTERFACE_IID "vcg.meshlab.MeshDecorateInterface/1.0" diff --git a/src/common/plugins/interfaces/edit_plugin_interface.h b/src/common/plugins/interfaces/edit_plugin_interface.h index 0bcc30c05..dbef94a03 100644 --- a/src/common/plugins/interfaces/edit_plugin_interface.h +++ b/src/common/plugins/interfaces/edit_plugin_interface.h @@ -105,6 +105,8 @@ class EditPluginInterfaceFactory { public: virtual ~EditPluginInterfaceFactory() {} + + virtual std::pair getMLVersion() const = 0; //returns the plugin name virtual QString pluginName() const = 0; @@ -117,10 +119,22 @@ public: //get the description for the given action virtual QString getEditToolDescription(const QAction *) = 0; - }; -#define MESHLAB_PLUGIN_IID_EXPORTER(x) Q_PLUGIN_METADATA(IID x) +#define MESHLAB_EDIT_PLUGIN \ + public: \ + virtual std::pair getMLVersion() const { \ + return std::make_pair(meshlab::meshlabVersion(), meshlab::builtWithDoublePrecision()); \ + } \ + private: + +#define MESHLAB_PLUGIN_IID_EXPORTER(x) \ + Q_PLUGIN_METADATA(IID x) \ + public: \ + virtual std::pair getMLVersion() const { \ + return std::make_pair(meshlab::meshlabVersion(), meshlab::builtWithDoublePrecision()); \ + } \ + private: #define MESHLAB_PLUGIN_NAME_EXPORTER(x) #define EDIT_PLUGIN_INTERFACE_IID "vcg.meshlab.EditPluginInterface/1.0" diff --git a/src/common/plugins/interfaces/filter_plugin_interface.h b/src/common/plugins/interfaces/filter_plugin_interface.h index 0fef4a3ad..248210146 100644 --- a/src/common/plugins/interfaces/filter_plugin_interface.h +++ b/src/common/plugins/interfaces/filter_plugin_interface.h @@ -40,7 +40,7 @@ Q_DECLARE_METATYPE(Eigen::VectorXd) *\brief The FilterPluginInterface class provide the interface of the filter plugins. * */ -class FilterPluginInterface : public PluginInterface +class FilterPluginInterface : virtual public PluginInterface { public: /** @@ -233,7 +233,13 @@ protected: QString errorMessage; }; -#define MESHLAB_PLUGIN_IID_EXPORTER(x) Q_PLUGIN_METADATA(IID x) +#define MESHLAB_PLUGIN_IID_EXPORTER(x) \ + Q_PLUGIN_METADATA(IID x) \ + public: \ + virtual std::pair getMLVersion() const { \ + return std::make_pair(meshlab::meshlabVersion(), meshlab::builtWithDoublePrecision()); \ + } \ + private: #define MESHLAB_PLUGIN_NAME_EXPORTER(x) #define FILTER_PLUGIN_INTERFACE_IID "vcg.meshlab.FilterPluginInterface/1.0" diff --git a/src/common/plugins/interfaces/iomesh_plugin_interface.h b/src/common/plugins/interfaces/iomesh_plugin_interface.h index e65e1c769..d972c423d 100644 --- a/src/common/plugins/interfaces/iomesh_plugin_interface.h +++ b/src/common/plugins/interfaces/iomesh_plugin_interface.h @@ -31,7 +31,7 @@ /** \brief The IOPluginInterface is the base class for all the single mesh loading plugins. */ -class IOMeshPluginInterface : public PluginInterface +class IOMeshPluginInterface : virtual public PluginInterface { public: IOMeshPluginInterface() : PluginInterface() { } @@ -103,7 +103,13 @@ protected: }; -#define MESHLAB_PLUGIN_IID_EXPORTER(x) Q_PLUGIN_METADATA(IID x) +#define MESHLAB_PLUGIN_IID_EXPORTER(x) \ + Q_PLUGIN_METADATA(IID x) \ + public: \ + virtual std::pair getMLVersion() const { \ + return std::make_pair(meshlab::meshlabVersion(), meshlab::builtWithDoublePrecision()); \ + } \ + private: #define MESHLAB_PLUGIN_NAME_EXPORTER(x) #define IOMESH_PLUGIN_INTERFACE_IID "vcg.meshlab.IOMeshPluginInterface/1.0" diff --git a/src/common/plugins/interfaces/ioraster_plugin_interface.h b/src/common/plugins/interfaces/ioraster_plugin_interface.h index 748ded537..e6aa90974 100644 --- a/src/common/plugins/interfaces/ioraster_plugin_interface.h +++ b/src/common/plugins/interfaces/ioraster_plugin_interface.h @@ -28,7 +28,7 @@ #include "../../utilities/file_format.h" #include "../../ml_document/raster_model.h" -class IORasterPluginInterface : public PluginInterface +class IORasterPluginInterface : virtual public PluginInterface { public: IORasterPluginInterface() : PluginInterface() {} @@ -59,7 +59,13 @@ protected: QString errorMessage; }; -#define MESHLAB_PLUGIN_IID_EXPORTER(x) Q_PLUGIN_METADATA(IID x) +#define MESHLAB_PLUGIN_IID_EXPORTER(x) \ + Q_PLUGIN_METADATA(IID x) \ + public: \ + virtual std::pair getMLVersion() const { \ + return std::make_pair(meshlab::meshlabVersion(), meshlab::builtWithDoublePrecision()); \ + } \ + private: #define MESHLAB_PLUGIN_NAME_EXPORTER(x) #define IORASTER_PLUGIN_INTERFACE_IID "vcg.meshlab.IORasterPluginInterface/1.0" diff --git a/src/common/plugins/interfaces/plugin_interface.h b/src/common/plugins/interfaces/plugin_interface.h index 10265ff5e..41ec2fb0e 100644 --- a/src/common/plugins/interfaces/plugin_interface.h +++ b/src/common/plugins/interfaces/plugin_interface.h @@ -29,6 +29,7 @@ #include "../../GLLogStream.h" #include "../../parameters/rich_parameter_list.h" +#include "../../globals.h" /** * \brief The PluginInterface class is the base of all the plugin interfaces. @@ -53,6 +54,15 @@ public: PluginInterface(); virtual ~PluginInterface() {} + /** + * This function will be automatically defined in your plugin class + * when you use the MESHLAB_PLUGIN_IID_EXPORTER macro. + * The only exception is for the Edit plugins (not EditFactory!): + * in this case, this function is defined by the macro + * MESHLAB_EDIT_PLUGIN + **/ + virtual std::pair getMLVersion() const = 0; + /** * @brief This functions returns the name of the current plugin. * Must be implemented in every plugin. diff --git a/src/common/plugins/interfaces/render_plugin_interface.h b/src/common/plugins/interfaces/render_plugin_interface.h index 4fcf3e1d0..911127a1f 100644 --- a/src/common/plugins/interfaces/render_plugin_interface.h +++ b/src/common/plugins/interfaces/render_plugin_interface.h @@ -49,7 +49,7 @@ if(mp->visible) mp->Render(rm.drawMode,rm.colorMode,rm.textureMode); class GLArea; -class RenderPluginInterface : public PluginInterface +class RenderPluginInterface : virtual public PluginInterface { public: RenderPluginInterface() :PluginInterface() {} @@ -62,7 +62,13 @@ public: virtual QList actions() = 0; }; -#define MESHLAB_PLUGIN_IID_EXPORTER(x) Q_PLUGIN_METADATA(IID x) +#define MESHLAB_PLUGIN_IID_EXPORTER(x) \ + Q_PLUGIN_METADATA(IID x) \ + public: \ + virtual std::pair getMLVersion() const { \ + return std::make_pair(meshlab::meshlabVersion(), meshlab::builtWithDoublePrecision()); \ + } \ + private: #define MESHLAB_PLUGIN_NAME_EXPORTER(x) #define RENDER_PLUGIN_INTERFACE_IID "vcg.meshlab.RenderPluginInterface/1.0" diff --git a/src/common/plugins/plugin_manager.cpp b/src/common/plugins/plugin_manager.cpp index 18837fe36..e16ac9d64 100644 --- a/src/common/plugins/plugin_manager.cpp +++ b/src/common/plugins/plugin_manager.cpp @@ -92,9 +92,9 @@ unsigned int PluginManager::size() const return allPlugins.size(); } -int PluginManager::numberIOPlugins() const -{ - return ioMeshPlugins.size(); +int PluginManager::numberIOPlugins() const +{ + return ioMeshPlugins.size(); } // Search among all the decorator plugins the one that contains a decoration with the given name @@ -221,99 +221,141 @@ PluginManager::EditPluginFactoryRangeIterator PluginManager::editPluginFactoryIt return EditPluginFactoryRangeIterator(this); } -void PluginManager::loadPlugin(QString& fileName) +bool PluginManager::loadPlugin(const QString& fileName) { QString absfilepath = pluginsDir.absoluteFilePath(fileName); QFileInfo fin(absfilepath); QPluginLoader loader(absfilepath); QObject *plugin = loader.instance(); - if (plugin) { - PluginInterface *iCommon = nullptr; + if (!plugin) { + qDebug() << loader.errorString(); + return false; + } + + PluginInterface* ip = dynamic_cast(plugin); + EditPluginInterfaceFactory* efp = qobject_cast(plugin); + if (!ip && !efp){ + qDebug() << fin.fileName() << " is not a MeshLab plugin."; + return false; + } + if (ip && ip->getMLVersion().second != MeshLabScalarTest::doublePrecision()) { + qDebug() << fin.fileName() << " has different floating point precision from the running MeshLab version."; + return false; + } + + if (efp && efp->getMLVersion().second != MeshLabScalarTest::doublePrecision()) { + qDebug() << fin.fileName() << " has different floating point precision from the running MeshLab version."; + return false; + } + + //TODO: check in some way also the meshlab version of the plugin + + if (ip) { //Classic MeshLab plugin (non Edit...) + bool loadOk = false; + //FilterPlugin FilterPluginInterface *iFilter = qobject_cast(plugin); if (iFilter) - { - iCommon = iFilter; - bool loadFilterOK = true; - for(QAction *filterAction : iFilter->actions()) { - if(iFilter->getClass(filterAction)==FilterPluginInterface::Generic){ - qDebug() << "Missing class for " +fileName + " " + filterAction->text(); - loadFilterOK = false; - } - if(iFilter->getRequirements(filterAction) == int(MeshModel::MM_UNKNOWN)){ - qDebug() << "Missing requirements for " +fileName + " " + filterAction->text(); - loadFilterOK = false; - } - if(iFilter->getPreConditions(filterAction) == int(MeshModel::MM_UNKNOWN)){ - qDebug() << "Missing preconditions for "+fileName + " " + filterAction->text(); - loadFilterOK = false; - } - if(iFilter->postCondition(filterAction) == int(MeshModel::MM_UNKNOWN )) { - qDebug() << "Missing postcondition for "+fileName + " " + filterAction->text(); - loadFilterOK = false; - } - if(iFilter->filterArity(filterAction) == FilterPluginInterface::UNKNOWN_ARITY ) { - qDebug() << "Missing Arity for " +fileName + " " + filterAction->text(); - loadFilterOK = false; - } - } - if (loadFilterOK) { - for(QAction *filterAction : iFilter->actions()) { - filterAction->setData(QVariant(fileName)); - actionFilterMap.insert(filterAction->text(), filterAction); - } - filterPlugins.push_back(iFilter); - } - } + loadOk = loadFilterPlugin(iFilter, fileName); + //IOMesh IOMeshPluginInterface *iIOMesh = qobject_cast(plugin); if (iIOMesh) - { - iCommon = iIOMesh; - ioMeshPlugins.push_back(iIOMesh); - } - + loadOk = loadIOMeshPlugin(iIOMesh, fileName); + //IORaster IORasterPluginInterface* iIORaster = qobject_cast(plugin); - if (iIORaster){ - iCommon = iIORaster; - ioRasterPlugins.push_back(iIORaster); - } - + if (iIORaster) + loadOk = loadIORasterPlugin(iIORaster, fileName); + //Decorate DecoratePluginInterface *iDecorator = qobject_cast(plugin); if (iDecorator) - { - iCommon = iDecorator; - decoratePlugins.push_back(iDecorator); - for(QAction *decoratorAction : iDecorator->actions()) - { - iDecorator->initGlobalParameterList(decoratorAction, meshlab::defaultGlobalParameterList()); - } - } - + loadOk = loadDecoratePlugin(iDecorator, fileName); + //Render RenderPluginInterface *iRender = qobject_cast(plugin); if (iRender) - { - iCommon = iRender; - renderPlugins.push_back(iRender); - } + loadOk = loadRenderPlugin(iRender, fileName); - EditPluginInterfaceFactory *iEditFactory = qobject_cast(plugin); - if (iEditFactory) - { - editPlugins.push_back(iEditFactory); - } - else if (iCommon) - { - if (allPlugins.find(iCommon->pluginName()) == allPlugins.end()) { - allPlugins[iCommon->pluginName()] = iCommon; + if (loadOk){ //If the plugin has been loaded correctly + if (allPlugins.find(ip->pluginName()) != allPlugins.end()) { + qDebug() << "Warning: " << ip->pluginName() << " has been already loaded.\n"; } - else{ - qDebug() << "Warning: " << iCommon->pluginName() << " has been already loaded.\n"; - } - } else { - // qDebug("Plugin %s was loaded, but could not be casted to any known type.", qUtf8Printable(fileName)); + allPlugins[ip->pluginName()] = ip; } } - else - qDebug() << loader.errorString(); + if (efp) { //EditFactory Plugin + //EditFactory + EditPluginInterfaceFactory *iEditFactory = qobject_cast(plugin); + if (iEditFactory) + loadEditPlugin(iEditFactory, fileName); + + } + return true; +} + +bool PluginManager::loadFilterPlugin(FilterPluginInterface* iFilter, const QString& fileName ) +{ + bool loadFilterOK = true; + for(QAction *filterAction : iFilter->actions()) { + if(iFilter->getClass(filterAction)==FilterPluginInterface::Generic){ + qDebug() << "Missing class for " +fileName + " " + filterAction->text(); + loadFilterOK = false; + } + if(iFilter->getRequirements(filterAction) == int(MeshModel::MM_UNKNOWN)){ + qDebug() << "Missing requirements for " +fileName + " " + filterAction->text(); + loadFilterOK = false; + } + if(iFilter->getPreConditions(filterAction) == int(MeshModel::MM_UNKNOWN)){ + qDebug() << "Missing preconditions for "+fileName + " " + filterAction->text(); + loadFilterOK = false; + } + if(iFilter->postCondition(filterAction) == int(MeshModel::MM_UNKNOWN )) { + qDebug() << "Missing postcondition for "+fileName + " " + filterAction->text(); + loadFilterOK = false; + } + if(iFilter->filterArity(filterAction) == FilterPluginInterface::UNKNOWN_ARITY ) { + qDebug() << "Missing Arity for " +fileName + " " + filterAction->text(); + loadFilterOK = false; + } + } + if (loadFilterOK) { + for(QAction *filterAction : iFilter->actions()) { + filterAction->setData(QVariant(fileName)); + actionFilterMap.insert(filterAction->text(), filterAction); + } + filterPlugins.push_back(iFilter); + } + return loadFilterOK; +} + +bool PluginManager::loadIOMeshPlugin(IOMeshPluginInterface* iIOMesh, const QString&) +{ + ioMeshPlugins.push_back(iIOMesh); + return true; +} + +bool PluginManager::loadIORasterPlugin(IORasterPluginInterface* iIORaster, const QString&) +{ + ioRasterPlugins.push_back(iIORaster); + return true; +} + +bool PluginManager::loadDecoratePlugin(DecoratePluginInterface* iDecorate, const QString&) +{ + decoratePlugins.push_back(iDecorate); + for(QAction *decoratorAction : iDecorate->actions()) { + iDecorate->initGlobalParameterList(decoratorAction, meshlab::defaultGlobalParameterList()); + } + return true; +} + +bool PluginManager::loadRenderPlugin(RenderPluginInterface* iRender, const QString&) +{ + renderPlugins.push_back(iRender); + return true; +} + +bool PluginManager::loadEditPlugin(EditPluginInterfaceFactory* iEditFactory, const QString&) +{ + editPlugins.push_back(iEditFactory); + return true; } void PluginManager::fillKnownIOFormats() diff --git a/src/common/plugins/plugin_manager.h b/src/common/plugins/plugin_manager.h index 1cddbaba3..7be25412f 100644 --- a/src/common/plugins/plugin_manager.h +++ b/src/common/plugins/plugin_manager.h @@ -156,7 +156,7 @@ public: private: QDir pluginsDir; - //all plugins + //all plugins (except Edit plugins) std::map allPlugins; //IOMeshPlugins @@ -185,7 +185,14 @@ private: QVector editPlugins; //Private member functions - void loadPlugin(QString& filename); + bool loadPlugin(const QString& filename); + + bool loadFilterPlugin(FilterPluginInterface* iFilter, const QString& fileName); + bool loadIOMeshPlugin(IOMeshPluginInterface* iIOMesh, const QString& fileName); + bool loadIORasterPlugin(IORasterPluginInterface* iIORaster, const QString& fileName); + bool loadDecoratePlugin(DecoratePluginInterface* iDecorate, const QString& fileName); + bool loadRenderPlugin(RenderPluginInterface* iRender, const QString& fileName); + bool loadEditPlugin(EditPluginInterfaceFactory* iEditFactory, const QString& fileName); void fillKnownIOFormats(); diff --git a/src/meshlabplugins/decorate_background/decorate_background.h b/src/meshlabplugins/decorate_background/decorate_background.h index 6cb0a2bd1..d056cb179 100644 --- a/src/meshlabplugins/decorate_background/decorate_background.h +++ b/src/meshlabplugins/decorate_background/decorate_background.h @@ -41,7 +41,7 @@ New small samples class DecorateBackgroundPlugin : public QObject, public DecoratePluginInterface { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(DECORATE_PLUGIN_INTERFACE_IID) + MESHLAB_PLUGIN_IID_EXPORTER(DECORATE_PLUGIN_INTERFACE_IID) Q_INTERFACES(DecoratePluginInterface) QString decorationName(FilterIDType id) const; QString decorationInfo(FilterIDType id) const; diff --git a/src/meshlabplugins/decorate_base/decorate_base.h b/src/meshlabplugins/decorate_base/decorate_base.h index ced1c5d0f..19e012af7 100644 --- a/src/meshlabplugins/decorate_base/decorate_base.h +++ b/src/meshlabplugins/decorate_base/decorate_base.h @@ -38,7 +38,7 @@ typedef std::pair PointPC; // this type is used to have a class DecorateBasePlugin : public QObject, public DecoratePluginInterface { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(DECORATE_PLUGIN_INTERFACE_IID) + MESHLAB_PLUGIN_IID_EXPORTER(DECORATE_PLUGIN_INTERFACE_IID) Q_INTERFACES(DecoratePluginInterface) QString decorationName(FilterIDType filter) const; QString decorationInfo(FilterIDType filter) const; diff --git a/src/meshlabplugins/decorate_shadow/decorate_shadow.h b/src/meshlabplugins/decorate_shadow/decorate_shadow.h index 22f5d5427..d6d328b6a 100644 --- a/src/meshlabplugins/decorate_shadow/decorate_shadow.h +++ b/src/meshlabplugins/decorate_shadow/decorate_shadow.h @@ -35,7 +35,7 @@ class DecorateShadowPlugin : public QObject, public DecoratePluginInterface { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(DECORATE_PLUGIN_INTERFACE_IID) + MESHLAB_PLUGIN_IID_EXPORTER(DECORATE_PLUGIN_INTERFACE_IID) Q_INTERFACES(DecoratePluginInterface) enum { diff --git a/src/meshlabplugins/edit_align/edit_align.h b/src/meshlabplugins/edit_align/edit_align.h index a16363039..69151edd7 100644 --- a/src/meshlabplugins/edit_align/edit_align.h +++ b/src/meshlabplugins/edit_align/edit_align.h @@ -34,7 +34,8 @@ class EditAlignPlugin : public QObject, public EditPluginInterface { Q_OBJECT - Q_INTERFACES(EditPluginInterface) + MESHLAB_EDIT_PLUGIN + Q_INTERFACES(EditPluginInterface) enum { diff --git a/src/meshlabplugins/edit_align/edit_align_factory.h b/src/meshlabplugins/edit_align/edit_align_factory.h index 92ec44b99..14ec5ee8a 100644 --- a/src/meshlabplugins/edit_align/edit_align_factory.h +++ b/src/meshlabplugins/edit_align/edit_align_factory.h @@ -31,7 +31,7 @@ class EditAlignFactory : public QObject, public EditPluginInterfaceFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) Q_INTERFACES(EditPluginInterfaceFactory) public: diff --git a/src/meshlabplugins/edit_manipulators/edit_manipulators.h b/src/meshlabplugins/edit_manipulators/edit_manipulators.h index e570784ac..724169853 100644 --- a/src/meshlabplugins/edit_manipulators/edit_manipulators.h +++ b/src/meshlabplugins/edit_manipulators/edit_manipulators.h @@ -31,8 +31,9 @@ class EditManipulatorsPlugin : public QObject, public EditPluginInterface { - Q_OBJECT - Q_INTERFACES(EditPluginInterface) + Q_OBJECT + MESHLAB_EDIT_PLUGIN + Q_INTERFACES(EditPluginInterface) public: diff --git a/src/meshlabplugins/edit_measure/edit_measure.h b/src/meshlabplugins/edit_measure/edit_measure.h index 8c6686d70..5e2622f98 100644 --- a/src/meshlabplugins/edit_measure/edit_measure.h +++ b/src/meshlabplugins/edit_measure/edit_measure.h @@ -49,8 +49,9 @@ public: class EditMeasurePlugin : public QObject, public EditPluginInterface { - Q_OBJECT - Q_INTERFACES(EditPluginInterface) + Q_OBJECT + MESHLAB_EDIT_PLUGIN + Q_INTERFACES(EditPluginInterface) public: EditMeasurePlugin(); diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.h b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.h index 30e1c33dd..85b441a6b 100644 --- a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.h +++ b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.h @@ -36,6 +36,7 @@ class EditMutualCorrsPlugin : public QObject, public EditPluginInterface { Q_OBJECT + MESHLAB_EDIT_PLUGIN Q_INTERFACES(EditPluginInterface) public: diff --git a/src/meshlabplugins/edit_paint/edit_paint.h b/src/meshlabplugins/edit_paint/edit_paint.h index 7d8b1d3f7..a188a888f 100644 --- a/src/meshlabplugins/edit_paint/edit_paint.h +++ b/src/meshlabplugins/edit_paint/edit_paint.h @@ -51,7 +51,8 @@ enum PaintOptions { */ class EditPaintPlugin : public QObject, public EditPluginInterface { Q_OBJECT - Q_INTERFACES(EditPluginInterface) + MESHLAB_EDIT_PLUGIN + Q_INTERFACES(EditPluginInterface) public: EditPaintPlugin(); diff --git a/src/meshlabplugins/edit_pickpoints/editpickpoints.h b/src/meshlabplugins/edit_pickpoints/editpickpoints.h index e3e18686d..f536ea8d3 100644 --- a/src/meshlabplugins/edit_pickpoints/editpickpoints.h +++ b/src/meshlabplugins/edit_pickpoints/editpickpoints.h @@ -36,6 +36,7 @@ class EditPickPointsPlugin : public QObject, public EditPluginInterface { Q_OBJECT + MESHLAB_EDIT_PLUGIN Q_INTERFACES(EditPluginInterface) public: diff --git a/src/meshlabplugins/edit_point/edit_point.h b/src/meshlabplugins/edit_point/edit_point.h index 56f071b3c..e990dec6a 100644 --- a/src/meshlabplugins/edit_point/edit_point.h +++ b/src/meshlabplugins/edit_point/edit_point.h @@ -30,6 +30,7 @@ class EditPointPlugin : public QObject, public EditPluginInterface { Q_OBJECT + MESHLAB_EDIT_PLUGIN Q_INTERFACES(EditPluginInterface) public: diff --git a/src/meshlabplugins/edit_quality/qualitymapper.h b/src/meshlabplugins/edit_quality/qualitymapper.h index dd22cdb45..a8c0a2e92 100644 --- a/src/meshlabplugins/edit_quality/qualitymapper.h +++ b/src/meshlabplugins/edit_quality/qualitymapper.h @@ -41,7 +41,8 @@ FIRST RELEASE class QualityMapperPlugin : public QObject, public EditPluginInterface { Q_OBJECT - Q_INTERFACES(EditPluginInterface) + MESHLAB_EDIT_PLUGIN + Q_INTERFACES(EditPluginInterface) private: QualityMapperDialog *_qualityMapperDialog; diff --git a/src/meshlabplugins/edit_referencing/edit_referencing.h b/src/meshlabplugins/edit_referencing/edit_referencing.h index a29282261..e5ed08bc3 100644 --- a/src/meshlabplugins/edit_referencing/edit_referencing.h +++ b/src/meshlabplugins/edit_referencing/edit_referencing.h @@ -35,6 +35,7 @@ class EditReferencingPlugin : public QObject, public EditPluginInterface { Q_OBJECT + MESHLAB_EDIT_PLUGIN Q_INTERFACES(EditPluginInterface) public: diff --git a/src/meshlabplugins/edit_sample/edit_sample.h b/src/meshlabplugins/edit_sample/edit_sample.h index e58bfd4eb..6b6a4bda9 100644 --- a/src/meshlabplugins/edit_sample/edit_sample.h +++ b/src/meshlabplugins/edit_sample/edit_sample.h @@ -30,6 +30,7 @@ class SampleEditPlugin : public QObject, public EditPluginInterface { Q_OBJECT + MESHLAB_EDIT_PLUGIN Q_INTERFACES(EditPluginInterface) public: diff --git a/src/meshlabplugins/edit_select/edit_select.h b/src/meshlabplugins/edit_select/edit_select.h index 28741649a..cbd4b2c7e 100644 --- a/src/meshlabplugins/edit_select/edit_select.h +++ b/src/meshlabplugins/edit_select/edit_select.h @@ -28,7 +28,8 @@ class EditSelectPlugin : public QObject, public EditPluginInterface { Q_OBJECT - Q_INTERFACES(EditPluginInterface) + MESHLAB_EDIT_PLUGIN + Q_INTERFACES(EditPluginInterface) public: @@ -65,9 +66,9 @@ public: GLdouble mvMatrix_f[16]; GLdouble prMatrix_f[16]; GLint viewpSize[4]; - Eigen::Matrix SelMatrix; - Scalarm SelViewport[4]; - + Eigen::Matrix SelMatrix; + Scalarm SelViewport[4]; + signals: void setDecorator(QString, bool); diff --git a/src/meshlabplugins/filter_ao/filter_ao.h b/src/meshlabplugins/filter_ao/filter_ao.h index a248ded47..61ba767a4 100644 --- a/src/meshlabplugins/filter_ao/filter_ao.h +++ b/src/meshlabplugins/filter_ao/filter_ao.h @@ -31,9 +31,9 @@ class AOGLWidget; class AmbientOcclusionPlugin : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) // Attributes protected: diff --git a/src/meshlabplugins/filter_camera/filter_camera.h b/src/meshlabplugins/filter_camera/filter_camera.h index 223b7c43e..8447f8b21 100644 --- a/src/meshlabplugins/filter_camera/filter_camera.h +++ b/src/meshlabplugins/filter_camera/filter_camera.h @@ -31,8 +31,8 @@ class FilterCameraPlugin : public QObject, public FilterPluginInterface { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: enum { FP_SET_MESH_CAMERA, diff --git a/src/meshlabplugins/filter_clean/cleanfilter.h b/src/meshlabplugins/filter_clean/cleanfilter.h index be4dc025c..656bad57c 100644 --- a/src/meshlabplugins/filter_clean/cleanfilter.h +++ b/src/meshlabplugins/filter_clean/cleanfilter.h @@ -29,9 +29,9 @@ class CleanFilter : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: /* naming convention : diff --git a/src/meshlabplugins/filter_colorproc/filter_colorproc.h b/src/meshlabplugins/filter_colorproc/filter_colorproc.h index 11335e023..1a8c05f9a 100644 --- a/src/meshlabplugins/filter_colorproc/filter_colorproc.h +++ b/src/meshlabplugins/filter_colorproc/filter_colorproc.h @@ -30,9 +30,9 @@ class FilterColorProc : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: enum { CP_FILLING, diff --git a/src/meshlabplugins/filter_create/filter_create.h b/src/meshlabplugins/filter_create/filter_create.h index 64b3188d2..a9e0f8f4d 100644 --- a/src/meshlabplugins/filter_create/filter_create.h +++ b/src/meshlabplugins/filter_create/filter_create.h @@ -27,9 +27,9 @@ class FilterCreate : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: enum { diff --git a/src/meshlabplugins/filter_createiso/filter_createiso.h b/src/meshlabplugins/filter_createiso/filter_createiso.h index 7207f5086..4648801ec 100644 --- a/src/meshlabplugins/filter_createiso/filter_createiso.h +++ b/src/meshlabplugins/filter_createiso/filter_createiso.h @@ -38,9 +38,9 @@ Added the new sample filter plugin that removes border faces class FilterCreateIso : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: /* naming convention : diff --git a/src/meshlabplugins/filter_csg/filter_csg.h b/src/meshlabplugins/filter_csg/filter_csg.h index 4cf5ce3d9..16309ed08 100644 --- a/src/meshlabplugins/filter_csg/filter_csg.h +++ b/src/meshlabplugins/filter_csg/filter_csg.h @@ -36,9 +36,9 @@ class FilterCSG : public QObject, public FilterPluginInterface { - Q_OBJECT + Q_OBJECT MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_INTERFACES(FilterPluginInterface) enum { CSG_OPERATION_INTERSECTION = 0, diff --git a/src/meshlabplugins/filter_dirt/filter_dirt.h b/src/meshlabplugins/filter_dirt/filter_dirt.h index 854074713..3c3f27a9d 100644 --- a/src/meshlabplugins/filter_dirt/filter_dirt.h +++ b/src/meshlabplugins/filter_dirt/filter_dirt.h @@ -38,9 +38,9 @@ using namespace vcg; class FilterDirt : public QObject, public FilterPluginInterface { - Q_OBJECT + Q_OBJECT MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_INTERFACES(FilterPluginInterface) protected: double x,y,z,nx,ny,nz,r,g,b,q,rad; //double x0,y0,z0,x1,y1,z1,x2,y2,z2,nx0,ny0,nz0,nx1,ny1,nz1,nx2,ny2,nz2,r0,g0,b0,r1,g1,b1,r2,g2,b2,q0,q1,q2; diff --git a/src/meshlabplugins/filter_fractal/filter_fractal.h b/src/meshlabplugins/filter_fractal/filter_fractal.h index 2fe907f99..f09e6c331 100644 --- a/src/meshlabplugins/filter_fractal/filter_fractal.h +++ b/src/meshlabplugins/filter_fractal/filter_fractal.h @@ -33,9 +33,9 @@ class FilterFractal : public QObject, public FilterPluginInterface { - Q_OBJECT + Q_OBJECT MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_INTERFACES(FilterPluginInterface) public: FilterFractal(); diff --git a/src/meshlabplugins/filter_globalregistration/globalregistration.h b/src/meshlabplugins/filter_globalregistration/globalregistration.h index 41f1ef004..46c8cb354 100644 --- a/src/meshlabplugins/filter_globalregistration/globalregistration.h +++ b/src/meshlabplugins/filter_globalregistration/globalregistration.h @@ -28,9 +28,9 @@ class GlobalRegistrationPlugin : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: enum { FP_GLOBAL_REGISTRATION } ; diff --git a/src/meshlabplugins/filter_img_patch_param/filter_img_patch_param.h b/src/meshlabplugins/filter_img_patch_param/filter_img_patch_param.h index 9a03c0db5..10f28feb5 100644 --- a/src/meshlabplugins/filter_img_patch_param/filter_img_patch_param.h +++ b/src/meshlabplugins/filter_img_patch_param/filter_img_patch_param.h @@ -37,9 +37,9 @@ class VisibleSet; class FilterImgPatchParamPlugin : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES( FilterPluginInterface ) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES( FilterPluginInterface ) enum { diff --git a/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.h b/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.h index 68a9fd74a..8c0b38470 100644 --- a/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.h +++ b/src/meshlabplugins/filter_isoparametrization/filter_isoparametrization.h @@ -33,9 +33,9 @@ class FilterIsoParametrization : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: enum {ISOP_PARAM, diff --git a/src/meshlabplugins/filter_layer/filter_layer.h b/src/meshlabplugins/filter_layer/filter_layer.h index 21d6e3ab7..486e02e7b 100644 --- a/src/meshlabplugins/filter_layer/filter_layer.h +++ b/src/meshlabplugins/filter_layer/filter_layer.h @@ -30,9 +30,9 @@ class FilterLayerPlugin : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: enum { diff --git a/src/meshlabplugins/filter_meshing/meshfilter.h b/src/meshlabplugins/filter_meshing/meshfilter.h index 45737d019..c0e31e9da 100644 --- a/src/meshlabplugins/filter_meshing/meshfilter.h +++ b/src/meshlabplugins/filter_meshing/meshfilter.h @@ -29,8 +29,8 @@ class ExtraMeshFilterPlugin : public QObject, public FilterPluginInterface { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) enum RefPlane { REF_CENTER,REF_MIN,REF_ORIG}; diff --git a/src/meshlabplugins/filter_plymc/filter_plymc.h b/src/meshlabplugins/filter_plymc/filter_plymc.h index b8e2809d8..90d5dc794 100644 --- a/src/meshlabplugins/filter_plymc/filter_plymc.h +++ b/src/meshlabplugins/filter_plymc/filter_plymc.h @@ -28,9 +28,9 @@ class PlyMCPlugin : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: enum { diff --git a/src/meshlabplugins/filter_qhull/filter_qhull.h b/src/meshlabplugins/filter_qhull/filter_qhull.h index 91d42be55..7a5fd7c4f 100644 --- a/src/meshlabplugins/filter_qhull/filter_qhull.h +++ b/src/meshlabplugins/filter_qhull/filter_qhull.h @@ -33,9 +33,9 @@ History class QhullPlugin : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: diff --git a/src/meshlabplugins/filter_quality/filterqualitymapper.h b/src/meshlabplugins/filter_quality/filterqualitymapper.h index db36a217d..fa888769b 100644 --- a/src/meshlabplugins/filter_quality/filterqualitymapper.h +++ b/src/meshlabplugins/filter_quality/filterqualitymapper.h @@ -57,9 +57,9 @@ public: class QualityMapperFilter : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) private: Frange _meshMinMaxQuality; diff --git a/src/meshlabplugins/filter_sample_dyn/filter_sample_dyn.h b/src/meshlabplugins/filter_sample_dyn/filter_sample_dyn.h index 7877ee345..1839a42b1 100644 --- a/src/meshlabplugins/filter_sample_dyn/filter_sample_dyn.h +++ b/src/meshlabplugins/filter_sample_dyn/filter_sample_dyn.h @@ -30,9 +30,9 @@ class ExtraSampleDynPlugin : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: enum { FP_VERTEX_COLOR_NOISE } ; diff --git a/src/meshlabplugins/filter_sampling/filter_sampling.h b/src/meshlabplugins/filter_sampling/filter_sampling.h index 5e939ad26..b5f382d3d 100644 --- a/src/meshlabplugins/filter_sampling/filter_sampling.h +++ b/src/meshlabplugins/filter_sampling/filter_sampling.h @@ -27,9 +27,9 @@ class FilterDocSampling : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: enum { diff --git a/src/meshlabplugins/filter_ssynth/filter_ssynth.h b/src/meshlabplugins/filter_ssynth/filter_ssynth.h index 0c813f5b3..812f0e420 100644 --- a/src/meshlabplugins/filter_ssynth/filter_ssynth.h +++ b/src/meshlabplugins/filter_ssynth/filter_ssynth.h @@ -30,10 +30,10 @@ #include #include -class FilterSSynth : public QObject,public IOMeshPluginInterface, public FilterPluginInterface{ - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface IOMeshPluginInterface) +class FilterSSynth : public QObject, public IOMeshPluginInterface, public FilterPluginInterface{ + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface IOMeshPluginInterface) public: enum {CR_SSYNTH} ; diff --git a/src/meshlabplugins/filter_texture/filter_texture.h b/src/meshlabplugins/filter_texture/filter_texture.h index 3d8a83b40..553c63c5b 100644 --- a/src/meshlabplugins/filter_texture/filter_texture.h +++ b/src/meshlabplugins/filter_texture/filter_texture.h @@ -36,9 +36,9 @@ class FilterTexturePlugin : public QObject, public FilterPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(FilterPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(FILTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(FilterPluginInterface) public: enum { diff --git a/src/meshlabplugins/io_3ds/meshio.h b/src/meshlabplugins/io_3ds/meshio.h index 6c0692da2..1cb4c8166 100644 --- a/src/meshlabplugins/io_3ds/meshio.h +++ b/src/meshlabplugins/io_3ds/meshio.h @@ -31,9 +31,9 @@ class ExtraMeshIOPlugin : public QObject, public IOMeshPluginInterface { - Q_OBJECT + Q_OBJECT MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) - Q_INTERFACES(IOMeshPluginInterface) + Q_INTERFACES(IOMeshPluginInterface) public: diff --git a/src/meshlabplugins/io_base/baseio.h b/src/meshlabplugins/io_base/baseio.h index 0677076f5..1cac2b573 100644 --- a/src/meshlabplugins/io_base/baseio.h +++ b/src/meshlabplugins/io_base/baseio.h @@ -29,8 +29,8 @@ class BaseMeshIOPlugin : public QObject, public IOMeshPluginInterface { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) - Q_INTERFACES(IOMeshPluginInterface) + MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) + Q_INTERFACES(IOMeshPluginInterface) public: diff --git a/src/meshlabplugins/io_bre/io_bre.h b/src/meshlabplugins/io_bre/io_bre.h index e863dbab0..559228713 100644 --- a/src/meshlabplugins/io_bre/io_bre.h +++ b/src/meshlabplugins/io_bre/io_bre.h @@ -152,9 +152,9 @@ namespace io { class BreMeshIOPlugin : public QObject, public IOMeshPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) - Q_INTERFACES(IOMeshPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) + Q_INTERFACES(IOMeshPluginInterface) public: diff --git a/src/meshlabplugins/io_collada/io_collada.h b/src/meshlabplugins/io_collada/io_collada.h index c5ed87cf6..da8af77dc 100644 --- a/src/meshlabplugins/io_collada/io_collada.h +++ b/src/meshlabplugins/io_collada/io_collada.h @@ -49,9 +49,9 @@ class ColladaIOPlugin : public QObject, public IOMeshPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) - Q_INTERFACES(IOMeshPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) + Q_INTERFACES(IOMeshPluginInterface) public: //std::map _mp; diff --git a/src/meshlabplugins/io_ctm/io_ctm.h b/src/meshlabplugins/io_ctm/io_ctm.h index 8331c0649..b53ceecde 100644 --- a/src/meshlabplugins/io_ctm/io_ctm.h +++ b/src/meshlabplugins/io_ctm/io_ctm.h @@ -36,9 +36,9 @@ class IOMPlugin : public QObject, public IOMeshPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) - Q_INTERFACES(IOMeshPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) + Q_INTERFACES(IOMeshPluginInterface) public: diff --git a/src/meshlabplugins/io_expe/io_expe.h b/src/meshlabplugins/io_expe/io_expe.h index 19e11832e..4527021d2 100644 --- a/src/meshlabplugins/io_expe/io_expe.h +++ b/src/meshlabplugins/io_expe/io_expe.h @@ -31,9 +31,9 @@ class ExpeIOPlugin : public QObject, public IOMeshPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) - Q_INTERFACES(IOMeshPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) + Q_INTERFACES(IOMeshPluginInterface) public: diff --git a/src/meshlabplugins/io_pdb/io_pdb.h b/src/meshlabplugins/io_pdb/io_pdb.h index 5cf17765d..18e612f81 100644 --- a/src/meshlabplugins/io_pdb/io_pdb.h +++ b/src/meshlabplugins/io_pdb/io_pdb.h @@ -29,9 +29,9 @@ class PDBIOPlugin : public QObject, public IOMeshPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) - Q_INTERFACES(IOMeshPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) + Q_INTERFACES(IOMeshPluginInterface) public: diff --git a/src/meshlabplugins/io_tri/io_tri.h b/src/meshlabplugins/io_tri/io_tri.h index 174d6e159..7572ea7b4 100755 --- a/src/meshlabplugins/io_tri/io_tri.h +++ b/src/meshlabplugins/io_tri/io_tri.h @@ -36,9 +36,9 @@ class TriIOPlugin : public QObject, public IOMeshPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) - Q_INTERFACES(IOMeshPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) + Q_INTERFACES(IOMeshPluginInterface) public: diff --git a/src/meshlabplugins/io_txt/io_txt.h b/src/meshlabplugins/io_txt/io_txt.h index a9c8924b4..5caead620 100755 --- a/src/meshlabplugins/io_txt/io_txt.h +++ b/src/meshlabplugins/io_txt/io_txt.h @@ -30,9 +30,9 @@ class TxtIOPlugin : public QObject, public IOMeshPluginInterface { - Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) - Q_INTERFACES(IOMeshPluginInterface) + Q_OBJECT + MESHLAB_PLUGIN_IID_EXPORTER(IOMESH_PLUGIN_INTERFACE_IID) + Q_INTERFACES(IOMeshPluginInterface) public: diff --git a/src/meshlabplugins/ioraster_base/ioraster_base.h b/src/meshlabplugins/ioraster_base/ioraster_base.h index b98b2a1f8..af9555570 100644 --- a/src/meshlabplugins/ioraster_base/ioraster_base.h +++ b/src/meshlabplugins/ioraster_base/ioraster_base.h @@ -29,8 +29,8 @@ class IORasterBasePlugin : public QObject, public IORasterPluginInterface { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(IORASTER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(IORasterPluginInterface) + MESHLAB_PLUGIN_IID_EXPORTER(IORASTER_PLUGIN_INTERFACE_IID) + Q_INTERFACES(IORasterPluginInterface) public: diff --git a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h index e03a2d098..f29809b10 100644 --- a/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h +++ b/src/meshlabplugins/render_radiance_scaling/radianceScalingRenderer.h @@ -36,9 +36,9 @@ #include "texture2D.h" class RadianceScalingRendererPlugin : public QObject, public RenderPluginInterface { - Q_OBJECT + Q_OBJECT MESHLAB_PLUGIN_IID_EXPORTER(RENDER_PLUGIN_INTERFACE_IID) - Q_INTERFACES(RenderPluginInterface) + Q_INTERFACES(RenderPluginInterface) bool _supported; QList _actionList;