From 04ea401ea1fe2fa5a36b77e370e6cec8db892832 Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Wed, 3 Mar 2021 10:45:47 +0100 Subject: [PATCH] EditPlugins --- .../containers/edit_plugin_container.cpp | 12 ++--- .../containers/edit_plugin_container.h | 10 ++-- src/common/plugins/interfaces/edit_plugin.h | 53 ++++++++++--------- .../plugins/interfaces/meshlab_plugin_file.h | 2 +- src/common/plugins/meshlab_plugin_type.cpp | 2 +- src/common/plugins/plugin_manager.cpp | 4 +- src/meshlab/dialogs/plugin_info_dialog.cpp | 2 +- src/meshlab/glarea.h | 8 +-- src/meshlab/mainwindow_Init.cpp | 6 +-- src/meshlab/mainwindow_RunTime.cpp | 8 +-- src/meshlabplugins/edit_align/edit_align.h | 4 +- .../edit_align/edit_align_factory.cpp | 2 +- .../edit_align/edit_align_factory.h | 8 +-- .../edit_manipulators/edit_manipulators.h | 4 +- .../edit_manipulators_factory.cpp | 2 +- .../edit_manipulators_factory.h | 8 +-- .../edit_measure/edit_measure.h | 4 +- .../edit_measure/edit_measure_factory.cpp | 2 +- .../edit_measure/edit_measure_factory.h | 8 +-- .../edit_mutualcorrs/edit_mutualcorrs.h | 4 +- .../edit_mutualcorrs_factory.cpp | 2 +- .../edit_mutualcorrs_factory.h | 8 +-- src/meshlabplugins/edit_paint/edit_paint.h | 4 +- .../edit_paint/edit_paint_factory.cpp | 2 +- .../edit_paint/edit_paint_factory.h | 8 +-- .../edit_pickpoints_factory.cpp | 2 +- .../edit_pickpoints/edit_pickpoints_factory.h | 8 +-- .../edit_pickpoints/editpickpoints.h | 4 +- src/meshlabplugins/edit_point/edit_point.h | 4 +- .../edit_point/edit_point_factory.cpp | 2 +- .../edit_point/edit_point_factory.h | 8 +-- .../edit_quality/edit_quality_factory.cpp | 2 +- .../edit_quality/edit_quality_factory.h | 8 +-- .../edit_quality/qualitymapper.h | 4 +- .../edit_referencing/edit_referencing.h | 4 +- .../edit_referencing_factory.cpp | 2 +- .../edit_referencing_factory.h | 8 +-- src/meshlabplugins/edit_sample/edit_sample.h | 4 +- .../edit_sample/edit_sample_factory.cpp | 2 +- .../edit_sample/edit_sample_factory.h | 8 +-- src/meshlabplugins/edit_select/edit_select.h | 4 +- .../edit_select/edit_select_factory.cpp | 2 +- .../edit_select/edit_select_factory.h | 8 +-- 43 files changed, 132 insertions(+), 129 deletions(-) diff --git a/src/common/plugins/containers/edit_plugin_container.cpp b/src/common/plugins/containers/edit_plugin_container.cpp index 8b026e987..ed022214f 100644 --- a/src/common/plugins/containers/edit_plugin_container.cpp +++ b/src/common/plugins/containers/edit_plugin_container.cpp @@ -32,12 +32,12 @@ void EditPluginContainer::clear() editPlugins.clear(); } -void EditPluginContainer::pushEditPlugin(EditPluginInterfaceFactory* iEditFactory) +void EditPluginContainer::pushEditPlugin(EditPluginFactory* iEditFactory) { editPlugins.push_back(iEditFactory); } -void EditPluginContainer::eraseEditPlugin(EditPluginInterfaceFactory* iEditFactory) +void EditPluginContainer::eraseEditPlugin(EditPluginFactory* iEditFactory) { editPlugins.erase(std::find(editPlugins.begin(), editPlugins.end(), iEditFactory)); } @@ -47,14 +47,14 @@ EditPluginContainer::EditPluginFactoryRangeIterator EditPluginContainer::editPlu return EditPluginFactoryRangeIterator(this, iterateAlsoDisabledPlugins); } -ConstPluginIterator EditPluginContainer::EditPluginFactoryRangeIterator::begin() +ConstPluginIterator EditPluginContainer::EditPluginFactoryRangeIterator::begin() { - return ConstPluginIterator(pm->editPlugins, pm->editPlugins.begin(), b); + return ConstPluginIterator(pm->editPlugins, pm->editPlugins.begin(), b); } -ConstPluginIterator EditPluginContainer::EditPluginFactoryRangeIterator::end() +ConstPluginIterator EditPluginContainer::EditPluginFactoryRangeIterator::end() { - return ConstPluginIterator(pm->editPlugins, pm->editPlugins.end(), b); + return ConstPluginIterator(pm->editPlugins, pm->editPlugins.end(), b); } EditPluginContainer::EditPluginFactoryRangeIterator::EditPluginFactoryRangeIterator( diff --git a/src/common/plugins/containers/edit_plugin_container.h b/src/common/plugins/containers/edit_plugin_container.h index 6818a361b..38abcdb8b 100644 --- a/src/common/plugins/containers/edit_plugin_container.h +++ b/src/common/plugins/containers/edit_plugin_container.h @@ -41,20 +41,20 @@ public: EditPluginContainer(); void clear(); - void pushEditPlugin(EditPluginInterfaceFactory* iEditFactory); - void eraseEditPlugin(EditPluginInterfaceFactory* iEditFactory); + void pushEditPlugin(EditPluginFactory* iEditFactory); + void eraseEditPlugin(EditPluginFactory* iEditFactory); EditPluginFactoryRangeIterator editPluginIterator(bool iterateAlsoDisabledPlugins = false) const; private: - std::vector editPlugins; + std::vector editPlugins; }; class EditPluginContainer::EditPluginFactoryRangeIterator { friend class EditPluginContainer; public: - ConstPluginIterator begin(); - ConstPluginIterator end(); + ConstPluginIterator begin(); + ConstPluginIterator end(); private: EditPluginFactoryRangeIterator(const EditPluginContainer* pm, bool iterateAlsoDisabledPlugins = false); const EditPluginContainer* pm; diff --git a/src/common/plugins/interfaces/edit_plugin.h b/src/common/plugins/interfaces/edit_plugin.h index baa08d6c0..b7aac988c 100644 --- a/src/common/plugins/interfaces/edit_plugin.h +++ b/src/common/plugins/interfaces/edit_plugin.h @@ -21,8 +21,8 @@ * * ****************************************************************************/ -#ifndef MESHLAB_EDIT_PLUGIN_INTERFACE_H -#define MESHLAB_EDIT_PLUGIN_INTERFACE_H +#ifndef MESHLAB_EDIT_PLUGIN_H +#define MESHLAB_EDIT_PLUGIN_H #include @@ -32,17 +32,17 @@ class GLArea; -/* -EditPluginInterface -Used to provide tools that needs some kind of interaction with the mesh. -Editing tools are exclusive (only one at a time) and can grab the mouse events and customize the rendering process. -*/ +/** + * @brief The EditPlugin class is used to provide tools that needs some kind of + * interaction with the mesh. Editing tools are exclusive (only one at a time) + * and can grab the mouse events and customize the rendering process. + **/ -class EditPluginInterface : public MeshLabPlugin +class EditPlugin : public MeshLabPlugin { public: - EditPluginInterface() : MeshLabPlugin() {} - virtual ~EditPluginInterface() {} + EditPlugin() : MeshLabPlugin() {} + virtual ~EditPlugin() {} //should return a sentence describing what the editing tool does static const QString Info(); @@ -95,23 +95,26 @@ private: }; -/** MeshEditInterfaceFactory -\short The MeshEditInterfaceFactory class is a factory is used to generate a object for each starting of an editing filter. - -This is needed because editing filters have a internal state, so if you want to have an editing tool for two different documents you have to instance two objects. -This class is used by the framework to generate an independent MeshEditInterface for each document. -*/ -class EditPluginInterfaceFactory : public MeshLabPluginFile +/** + * @brief The EditPluginFactory class is used to generate an action for each + * starting of an editing filter. + * + * This is needed because editing filters have a internal state, so if you want + * to have an editing tool for two different documents you have to instance + * two objects. This class is used by the framework to generate an independent + * EditPlugin for each document. + */ +class EditPluginFactory : public MeshLabPluginFile { public: - EditPluginInterfaceFactory() {} - virtual ~EditPluginInterfaceFactory() {} + EditPluginFactory() {} + virtual ~EditPluginFactory() {} //gets a list of actions available from this plugin virtual QList actions() const = 0; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction *) = 0; + virtual EditPlugin* getMeshEditInterface(const QAction *) = 0; //get the description for the given action virtual QString getEditToolDescription(const QAction *) = 0; @@ -124,11 +127,11 @@ public: } \ private: -#define EDIT_PLUGIN_INTERFACE_IID "vcg.meshlab.EditPluginInterface/1.0" -#define EDIT_PLUGIN_INTERFACE_FACTORY_IID "vcg.meshlab.EditPluginInterfaceFactory/1.0" +#define EDIT_PLUGIN_IID "vcg.meshlab.EditPlugin/1.0" +#define EDIT_PLUGIN_FACTORY_IID "vcg.meshlab.EditPluginFactory/1.0" -Q_DECLARE_INTERFACE(EditPluginInterface, EDIT_PLUGIN_INTERFACE_IID) -Q_DECLARE_INTERFACE(EditPluginInterfaceFactory, EDIT_PLUGIN_INTERFACE_FACTORY_IID) +Q_DECLARE_INTERFACE(EditPlugin, EDIT_PLUGIN_IID) +Q_DECLARE_INTERFACE(EditPluginFactory, EDIT_PLUGIN_FACTORY_IID) -#endif // MESHLAB_EDIT_PLUGIN_INTERFACE_H +#endif // MESHLAB_EDIT_PLUGIN_H diff --git a/src/common/plugins/interfaces/meshlab_plugin_file.h b/src/common/plugins/interfaces/meshlab_plugin_file.h index 5a4a5832f..0000bf190 100644 --- a/src/common/plugins/interfaces/meshlab_plugin_file.h +++ b/src/common/plugins/interfaces/meshlab_plugin_file.h @@ -32,7 +32,7 @@ * @brief The MeshLabPluginFile class is the base of all MeshLab plugin classes, * and represents the library file of the plugin. * Each MeshLab plugin can then be a classic plugin (and inherit from the MeshLabPlugin class) - * or a collection of Edit plugins (and inherit from the EditPluginInterfaceFactory class). + * or a collection of Edit plugins (and inherit from the EditPluginFactory class). * Each Plugin (classic or edit) inherits from this class. */ class MeshLabPluginFile diff --git a/src/common/plugins/meshlab_plugin_type.cpp b/src/common/plugins/meshlab_plugin_type.cpp index efda12355..7a5ccaa2a 100644 --- a/src/common/plugins/meshlab_plugin_type.cpp +++ b/src/common/plugins/meshlab_plugin_type.cpp @@ -38,7 +38,7 @@ MeshLabPluginType::MeshLabPluginType(const MeshLabPluginFile* fpi) : type(0) type |= DECORATE; } //EditFactory - const EditPluginInterfaceFactory* efp = dynamic_cast(fpi); + const EditPluginFactory* efp = dynamic_cast(fpi); if (efp) { //EditFactory Plugin type |= EDIT; } diff --git a/src/common/plugins/plugin_manager.cpp b/src/common/plugins/plugin_manager.cpp index a1c222070..fd44b0252 100644 --- a/src/common/plugins/plugin_manager.cpp +++ b/src/common/plugins/plugin_manager.cpp @@ -197,7 +197,7 @@ void PluginManager::loadPlugin(const QString& fileName) decoratePlugins.pushDecoratePlugin(qobject_cast(plugin)); } if (type.isEditPlugin()){ - editPlugins.pushEditPlugin(qobject_cast(plugin)); + editPlugins.pushEditPlugin(qobject_cast(plugin)); } if (type.isFilterPlugin()){ filterPlugins.pushFilterPlugin(qobject_cast(plugin)); @@ -228,7 +228,7 @@ void PluginManager::unloadPlugin(MeshLabPluginFile* ifp) decoratePlugins.eraseDecoratePlugin(dynamic_cast(ifp)); } if (type.isEditPlugin()){ - editPlugins.eraseEditPlugin(dynamic_cast(ifp)); + editPlugins.eraseEditPlugin(dynamic_cast(ifp)); } if (type.isFilterPlugin()){ filterPlugins.eraseFilterPlugin(dynamic_cast(ifp)); diff --git a/src/meshlab/dialogs/plugin_info_dialog.cpp b/src/meshlab/dialogs/plugin_info_dialog.cpp index 56d1651dd..08f3e00e7 100644 --- a/src/meshlab/dialogs/plugin_info_dialog.cpp +++ b/src/meshlab/dialogs/plugin_info_dialog.cpp @@ -157,7 +157,7 @@ void PluginInfoDialog::populateTreeWidget() tmplist.push_back(a->text()); } if (type.isEditPlugin()){ - EditPluginInterfaceFactory* epi = dynamic_cast(fp); + EditPluginFactory* epi = dynamic_cast(fp); for(QAction *a: epi->actions()) tmplist.push_back(a->text()); } diff --git a/src/meshlab/glarea.h b/src/meshlab/glarea.h index d42aefea1..eaaec8e4b 100644 --- a/src/meshlab/glarea.h +++ b/src/meshlab/glarea.h @@ -352,13 +352,13 @@ public: QAction * getCurrentEditAction() { return currentEditor; } //get the currently active mesh editor - EditPluginInterface * getCurrentMeshEditor() { return iEdit; } + EditPlugin * getCurrentMeshEditor() { return iEdit; } //see if this glAarea has a MESHEditInterface for this action bool editorExistsForAction(QAction *editAction){ return actionToMeshEditMap.contains(editAction); } //add a MeshEditInterface for the given action - void addMeshEditor(QAction *editAction, EditPluginInterface *editor){ actionToMeshEditMap.insert(editAction, editor); } + void addMeshEditor(QAction *editAction, EditPlugin *editor){ actionToMeshEditMap.insert(editAction, editor); } bool readyToClose(); float lastRenderingTime() { return lastTime;} void drawGradient(); @@ -453,10 +453,10 @@ private: QFont qFont; //font settings // Editing support - EditPluginInterface *iEdit; + EditPlugin *iEdit; QAction *currentEditor; QAction *suspendedEditRef; // reference to last Editing Mode Used - QMap actionToMeshEditMap; + QMap actionToMeshEditMap; //the last model that start edit was called with MeshModel *lastModelEdited; diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 71c7ceb6c..433dccb37 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -495,7 +495,7 @@ void MainWindow::createToolBars() editToolBar = addToolBar(tr("Edit")); editToolBar->addAction(suspendEditModeAct); - for(EditPluginInterfaceFactory *iEditFactory: PM.editPluginFactoryIterator()) { + for(EditPluginFactory *iEditFactory: PM.editPluginFactoryIterator()) { for(QAction* editAction: iEditFactory->actions()){ if (!editAction->icon().isNull()) { editToolBar->addAction(editAction); @@ -869,7 +869,7 @@ void MainWindow::fillShadersMenu() void MainWindow::fillEditMenu() { clearMenu(editMenu); - for(EditPluginInterfaceFactory *iEditFactory: PM.editPluginFactoryIterator()) + for(EditPluginFactory *iEditFactory: PM.editPluginFactoryIterator()) { for(QAction* editAction: iEditFactory->actions()) { @@ -909,7 +909,7 @@ void MainWindow::updateAllPluginsActions() editToolBar->clear(); editToolBar->addAction(suspendEditModeAct); - for(EditPluginInterfaceFactory *iEditFactory: PM.editPluginFactoryIterator()) { + for(EditPluginFactory *iEditFactory: PM.editPluginFactoryIterator()) { for(QAction* editAction: iEditFactory->actions()){ if (!editAction->icon().isNull()) { editToolBar->addAction(editAction); diff --git a/src/meshlab/mainwindow_RunTime.cpp b/src/meshlab/mainwindow_RunTime.cpp index 38fb5101d..e2694f43f 100644 --- a/src/meshlab/mainwindow_RunTime.cpp +++ b/src/meshlab/mainwindow_RunTime.cpp @@ -395,7 +395,7 @@ void MainWindow::updateMenus() // you exit from editing mode by pressing again the editing button // When you are in a editing mode all the other editing are disabled. - for (EditPluginInterfaceFactory* ep : PM.editPluginFactoryIterator()) + for (EditPluginFactory* ep : PM.editPluginFactoryIterator()) for (QAction* a : ep->actions()) { a->setChecked(false); a->setEnabled(GLA()->getCurrentEditAction() == nullptr); @@ -432,7 +432,7 @@ void MainWindow::updateMenus() } // if active else { - for (EditPluginInterfaceFactory* ep : PM.editPluginFactoryIterator()) { + for (EditPluginFactory* ep : PM.editPluginFactoryIterator()) { for (QAction* a : ep->actions()) { a->setEnabled(false); } @@ -1394,8 +1394,8 @@ void MainWindow::applyEditMode() //if this GLArea does not have an instance of this action's MeshEdit tool then give it one if(!GLA()->editorExistsForAction(action)) { - EditPluginInterfaceFactory *iEditFactory = qobject_cast(action->parent()); - EditPluginInterface *iEdit = iEditFactory->getMeshEditInterface(action); + EditPluginFactory *iEditFactory = qobject_cast(action->parent()); + EditPlugin *iEdit = iEditFactory->getMeshEditInterface(action); GLA()->addMeshEditor(action, iEdit); } meshDoc()->meshDocStateData().create(*meshDoc()); diff --git a/src/meshlabplugins/edit_align/edit_align.h b/src/meshlabplugins/edit_align/edit_align.h index 49a58a66a..529fe023b 100644 --- a/src/meshlabplugins/edit_align/edit_align.h +++ b/src/meshlabplugins/edit_align/edit_align.h @@ -31,11 +31,11 @@ #include #include "alignDialog.h" -class EditAlignPlugin : public QObject, public EditPluginInterface +class EditAlignPlugin : public QObject, public EditPlugin { Q_OBJECT MESHLAB_EDIT_PLUGIN - Q_INTERFACES(EditPluginInterface) + Q_INTERFACES(EditPlugin) enum { diff --git a/src/meshlabplugins/edit_align/edit_align_factory.cpp b/src/meshlabplugins/edit_align/edit_align_factory.cpp index 1f0c7ebdf..b48794a9e 100644 --- a/src/meshlabplugins/edit_align/edit_align_factory.cpp +++ b/src/meshlabplugins/edit_align/edit_align_factory.cpp @@ -46,7 +46,7 @@ QList EditAlignFactory::actions() const } //get the edit tool for the given action -EditPluginInterface* EditAlignFactory::getMeshEditInterface(const QAction *action) +EditPlugin* EditAlignFactory::getMeshEditInterface(const QAction *action) { assert(action == editAlign); (void) action; return new EditAlignPlugin(); diff --git a/src/meshlabplugins/edit_align/edit_align_factory.h b/src/meshlabplugins/edit_align/edit_align_factory.h index 94aa2d8a4..06f0a86db 100644 --- a/src/meshlabplugins/edit_align/edit_align_factory.h +++ b/src/meshlabplugins/edit_align/edit_align_factory.h @@ -28,11 +28,11 @@ #include #include -class EditAlignFactory : public QObject, public EditPluginInterfaceFactory +class EditAlignFactory : public QObject, public EditPluginFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) - Q_INTERFACES(EditPluginInterfaceFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) + Q_INTERFACES(EditPluginFactory) public: EditAlignFactory(); @@ -44,7 +44,7 @@ public: virtual QList actions() const; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction*); + virtual EditPlugin* getMeshEditInterface(const QAction*); //get the description for the given action virtual QString getEditToolDescription(const QAction*); diff --git a/src/meshlabplugins/edit_manipulators/edit_manipulators.h b/src/meshlabplugins/edit_manipulators/edit_manipulators.h index eae5f5f35..ee06e0684 100644 --- a/src/meshlabplugins/edit_manipulators/edit_manipulators.h +++ b/src/meshlabplugins/edit_manipulators/edit_manipulators.h @@ -29,11 +29,11 @@ #include -class EditManipulatorsPlugin : public QObject, public EditPluginInterface +class EditManipulatorsPlugin : public QObject, public EditPlugin { Q_OBJECT MESHLAB_EDIT_PLUGIN - Q_INTERFACES(EditPluginInterface) + Q_INTERFACES(EditPlugin) public: diff --git a/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.cpp b/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.cpp index 2112bbf28..cef3b379b 100644 --- a/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.cpp +++ b/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.cpp @@ -46,7 +46,7 @@ QList EditManipulatorsFactory::actions() const } //get the edit tool for the given action -EditPluginInterface* EditManipulatorsFactory::getMeshEditInterface(const QAction *action) +EditPlugin* EditManipulatorsFactory::getMeshEditInterface(const QAction *action) { if(action == editManipulators) { diff --git a/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.h b/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.h index 3e671a166..6c2f8aa43 100644 --- a/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.h +++ b/src/meshlabplugins/edit_manipulators/edit_manipulators_factory.h @@ -28,11 +28,11 @@ #include #include -class EditManipulatorsFactory : public QObject, public EditPluginInterfaceFactory +class EditManipulatorsFactory : public QObject, public EditPluginFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) - Q_INTERFACES(EditPluginInterfaceFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) + Q_INTERFACES(EditPluginFactory) public: EditManipulatorsFactory(); @@ -44,7 +44,7 @@ public: virtual QList actions() const; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction*); + virtual EditPlugin* getMeshEditInterface(const QAction*); //get the description for the given action virtual QString getEditToolDescription(const QAction*); diff --git a/src/meshlabplugins/edit_measure/edit_measure.h b/src/meshlabplugins/edit_measure/edit_measure.h index 2327ae5a6..87db5a556 100644 --- a/src/meshlabplugins/edit_measure/edit_measure.h +++ b/src/meshlabplugins/edit_measure/edit_measure.h @@ -47,11 +47,11 @@ public: //-------------------------------------- -class EditMeasurePlugin : public QObject, public EditPluginInterface +class EditMeasurePlugin : public QObject, public EditPlugin { Q_OBJECT MESHLAB_EDIT_PLUGIN - Q_INTERFACES(EditPluginInterface) + Q_INTERFACES(EditPlugin) public: EditMeasurePlugin(); diff --git a/src/meshlabplugins/edit_measure/edit_measure_factory.cpp b/src/meshlabplugins/edit_measure/edit_measure_factory.cpp index 7164ceaf4..c12f64e40 100644 --- a/src/meshlabplugins/edit_measure/edit_measure_factory.cpp +++ b/src/meshlabplugins/edit_measure/edit_measure_factory.cpp @@ -46,7 +46,7 @@ QList EditMeasureFactory::actions() const } //get the edit tool for the given action -EditPluginInterface* EditMeasureFactory::getMeshEditInterface(const QAction *action) +EditPlugin* EditMeasureFactory::getMeshEditInterface(const QAction *action) { if(action == editMeasure) { diff --git a/src/meshlabplugins/edit_measure/edit_measure_factory.h b/src/meshlabplugins/edit_measure/edit_measure_factory.h index 0277aa8a1..77ae88f1b 100644 --- a/src/meshlabplugins/edit_measure/edit_measure_factory.h +++ b/src/meshlabplugins/edit_measure/edit_measure_factory.h @@ -28,11 +28,11 @@ #include #include -class EditMeasureFactory : public QObject, public EditPluginInterfaceFactory +class EditMeasureFactory : public QObject, public EditPluginFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) - Q_INTERFACES(EditPluginInterfaceFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) + Q_INTERFACES(EditPluginFactory) public: EditMeasureFactory(); @@ -44,7 +44,7 @@ public: virtual QList actions() const; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction*); + virtual EditPlugin* getMeshEditInterface(const QAction*); //get the description for the given action virtual QString getEditToolDescription(const QAction*); diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.h b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.h index cbb03c7e5..9308b47f8 100644 --- a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.h +++ b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.h @@ -33,11 +33,11 @@ #include -class EditMutualCorrsPlugin : public QObject, public EditPluginInterface +class EditMutualCorrsPlugin : public QObject, public EditPlugin { Q_OBJECT MESHLAB_EDIT_PLUGIN - Q_INTERFACES(EditPluginInterface) + Q_INTERFACES(EditPlugin) public: EditMutualCorrsPlugin(); diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.cpp b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.cpp index 2045f735d..762846d71 100644 --- a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.cpp +++ b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.cpp @@ -46,7 +46,7 @@ QList EditMutualCorrsFactory::actions() const } //get the edit tool for the given action -EditPluginInterface* EditMutualCorrsFactory::getMeshEditInterface(const QAction *action) +EditPlugin* EditMutualCorrsFactory::getMeshEditInterface(const QAction *action) { if(action == editMutualCorrs) { diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.h b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.h index 1c9e1d880..92dfc1d21 100644 --- a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.h +++ b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs_factory.h @@ -27,11 +27,11 @@ #include #include -class EditMutualCorrsFactory : public QObject, public EditPluginInterfaceFactory +class EditMutualCorrsFactory : public QObject, public EditPluginFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) - Q_INTERFACES(EditPluginInterfaceFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) + Q_INTERFACES(EditPluginFactory) public: EditMutualCorrsFactory(); @@ -43,7 +43,7 @@ public: virtual QList actions() const; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction*); + virtual EditPlugin* getMeshEditInterface(const QAction*); //get the description for the given action virtual QString getEditToolDescription(const QAction*); diff --git a/src/meshlabplugins/edit_paint/edit_paint.h b/src/meshlabplugins/edit_paint/edit_paint.h index c7b5b0079..3508c34c1 100644 --- a/src/meshlabplugins/edit_paint/edit_paint.h +++ b/src/meshlabplugins/edit_paint/edit_paint.h @@ -49,10 +49,10 @@ enum PaintOptions { /** * EditPaint plugin main class (MeshEditing plugin) */ -class EditPaintPlugin : public QObject, public EditPluginInterface { +class EditPaintPlugin : public QObject, public EditPlugin { Q_OBJECT MESHLAB_EDIT_PLUGIN - Q_INTERFACES(EditPluginInterface) + Q_INTERFACES(EditPlugin) public: EditPaintPlugin(); diff --git a/src/meshlabplugins/edit_paint/edit_paint_factory.cpp b/src/meshlabplugins/edit_paint/edit_paint_factory.cpp index 2e2168073..538747e14 100644 --- a/src/meshlabplugins/edit_paint/edit_paint_factory.cpp +++ b/src/meshlabplugins/edit_paint/edit_paint_factory.cpp @@ -46,7 +46,7 @@ QList EditPaintFactory::actions() const } //get the edit tool for the given action -EditPluginInterface* EditPaintFactory::getMeshEditInterface(const QAction *action) +EditPlugin* EditPaintFactory::getMeshEditInterface(const QAction *action) { if(action == editPaint) { diff --git a/src/meshlabplugins/edit_paint/edit_paint_factory.h b/src/meshlabplugins/edit_paint/edit_paint_factory.h index f99df7499..59c791f72 100644 --- a/src/meshlabplugins/edit_paint/edit_paint_factory.h +++ b/src/meshlabplugins/edit_paint/edit_paint_factory.h @@ -28,11 +28,11 @@ #include -class EditPaintFactory : public QObject, public EditPluginInterfaceFactory +class EditPaintFactory : public QObject, public EditPluginFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) - Q_INTERFACES(EditPluginInterfaceFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) + Q_INTERFACES(EditPluginFactory) public: EditPaintFactory(); @@ -44,7 +44,7 @@ public: virtual QList actions() const; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction*); + virtual EditPlugin* getMeshEditInterface(const QAction*); //get the description for the given action virtual QString getEditToolDescription(const QAction*); diff --git a/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.cpp b/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.cpp index 5520f6ed2..5d1d3012b 100644 --- a/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.cpp +++ b/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.cpp @@ -46,7 +46,7 @@ QList EditPickPointsFactory::actions() const } //get the edit tool for the given action -EditPluginInterface* EditPickPointsFactory::getMeshEditInterface(const QAction *action) +EditPlugin* EditPickPointsFactory::getMeshEditInterface(const QAction *action) { if(action == editPickPoints) { return new EditPickPointsPlugin(); diff --git a/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h b/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h index 1c5812e34..4f96ea079 100644 --- a/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h +++ b/src/meshlabplugins/edit_pickpoints/edit_pickpoints_factory.h @@ -28,11 +28,11 @@ #include #include -class EditPickPointsFactory : public QObject, public EditPluginInterfaceFactory +class EditPickPointsFactory : public QObject, public EditPluginFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) - Q_INTERFACES(EditPluginInterfaceFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) + Q_INTERFACES(EditPluginFactory) public: EditPickPointsFactory(); @@ -44,7 +44,7 @@ public: virtual QList actions() const; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction*); + virtual EditPlugin* getMeshEditInterface(const QAction*); //get the description for the given action QString getEditToolDescription(const QAction*); diff --git a/src/meshlabplugins/edit_pickpoints/editpickpoints.h b/src/meshlabplugins/edit_pickpoints/editpickpoints.h index 51194ca76..ae39b25b6 100644 --- a/src/meshlabplugins/edit_pickpoints/editpickpoints.h +++ b/src/meshlabplugins/edit_pickpoints/editpickpoints.h @@ -33,11 +33,11 @@ #include #include "pickpointsDialog.h" -class EditPickPointsPlugin : public QObject, public EditPluginInterface +class EditPickPointsPlugin : public QObject, public EditPlugin { Q_OBJECT MESHLAB_EDIT_PLUGIN - Q_INTERFACES(EditPluginInterface) + Q_INTERFACES(EditPlugin) public: //constructor diff --git a/src/meshlabplugins/edit_point/edit_point.h b/src/meshlabplugins/edit_point/edit_point.h index 0472444ad..b37ab2497 100644 --- a/src/meshlabplugins/edit_point/edit_point.h +++ b/src/meshlabplugins/edit_point/edit_point.h @@ -27,11 +27,11 @@ #include #include -class EditPointPlugin : public QObject, public EditPluginInterface +class EditPointPlugin : public QObject, public EditPlugin { Q_OBJECT MESHLAB_EDIT_PLUGIN - Q_INTERFACES(EditPluginInterface) + Q_INTERFACES(EditPlugin) public: enum {SELECT_DEFAULT_MODE, SELECT_FITTING_PLANE_MODE}; diff --git a/src/meshlabplugins/edit_point/edit_point_factory.cpp b/src/meshlabplugins/edit_point/edit_point_factory.cpp index bf899e97f..6e8e32ca3 100644 --- a/src/meshlabplugins/edit_point/edit_point_factory.cpp +++ b/src/meshlabplugins/edit_point/edit_point_factory.cpp @@ -48,7 +48,7 @@ QList PointEditFactory::actions() const } //get the edit tool for the given action -EditPluginInterface* PointEditFactory::getMeshEditInterface(const QAction *action) +EditPlugin* PointEditFactory::getMeshEditInterface(const QAction *action) { if(action == editPoint) return new EditPointPlugin(EditPointPlugin::SELECT_DEFAULT_MODE); diff --git a/src/meshlabplugins/edit_point/edit_point_factory.h b/src/meshlabplugins/edit_point/edit_point_factory.h index cc7b15be9..adca868d4 100644 --- a/src/meshlabplugins/edit_point/edit_point_factory.h +++ b/src/meshlabplugins/edit_point/edit_point_factory.h @@ -28,11 +28,11 @@ #include #include -class PointEditFactory : public QObject, public EditPluginInterfaceFactory +class PointEditFactory : public QObject, public EditPluginFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) - Q_INTERFACES(EditPluginInterfaceFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) + Q_INTERFACES(EditPluginFactory) public: PointEditFactory(); @@ -44,7 +44,7 @@ public: virtual QList actions() const; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction*); + virtual EditPlugin* getMeshEditInterface(const QAction*); //get the description for the given action virtual QString getEditToolDescription(const QAction*); diff --git a/src/meshlabplugins/edit_quality/edit_quality_factory.cpp b/src/meshlabplugins/edit_quality/edit_quality_factory.cpp index b67de5d2b..22930051d 100644 --- a/src/meshlabplugins/edit_quality/edit_quality_factory.cpp +++ b/src/meshlabplugins/edit_quality/edit_quality_factory.cpp @@ -47,7 +47,7 @@ QList QualityMapperFactory::actions() const } //get the edit tool for the given action -EditPluginInterface* QualityMapperFactory::getMeshEditInterface(const QAction *action) +EditPlugin* QualityMapperFactory::getMeshEditInterface(const QAction *action) { if(action == editQuality) { diff --git a/src/meshlabplugins/edit_quality/edit_quality_factory.h b/src/meshlabplugins/edit_quality/edit_quality_factory.h index fce4f9525..e8150733a 100644 --- a/src/meshlabplugins/edit_quality/edit_quality_factory.h +++ b/src/meshlabplugins/edit_quality/edit_quality_factory.h @@ -28,11 +28,11 @@ #include #include -class QualityMapperFactory : public QObject, public EditPluginInterfaceFactory +class QualityMapperFactory : public QObject, public EditPluginFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) - Q_INTERFACES(EditPluginInterfaceFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) + Q_INTERFACES(EditPluginFactory) public: QualityMapperFactory(); @@ -44,7 +44,7 @@ public: virtual QList actions() const; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction*); + virtual EditPlugin* getMeshEditInterface(const QAction*); //get the description for the given action virtual QString getEditToolDescription(const QAction*); diff --git a/src/meshlabplugins/edit_quality/qualitymapper.h b/src/meshlabplugins/edit_quality/qualitymapper.h index f1acd3d15..f92092664 100644 --- a/src/meshlabplugins/edit_quality/qualitymapper.h +++ b/src/meshlabplugins/edit_quality/qualitymapper.h @@ -38,11 +38,11 @@ FIRST RELEASE #include "qualitymapperdialog.h" //This class defines the plugin interface -class QualityMapperPlugin : public QObject, public EditPluginInterface +class QualityMapperPlugin : public QObject, public EditPlugin { Q_OBJECT MESHLAB_EDIT_PLUGIN - Q_INTERFACES(EditPluginInterface) + Q_INTERFACES(EditPlugin) private: QualityMapperDialog *_qualityMapperDialog; diff --git a/src/meshlabplugins/edit_referencing/edit_referencing.h b/src/meshlabplugins/edit_referencing/edit_referencing.h index 8a5c29109..52166ff2e 100644 --- a/src/meshlabplugins/edit_referencing/edit_referencing.h +++ b/src/meshlabplugins/edit_referencing/edit_referencing.h @@ -32,11 +32,11 @@ #include -class EditReferencingPlugin : public QObject, public EditPluginInterface +class EditReferencingPlugin : public QObject, public EditPlugin { Q_OBJECT MESHLAB_EDIT_PLUGIN - Q_INTERFACES(EditPluginInterface) + Q_INTERFACES(EditPlugin) public: diff --git a/src/meshlabplugins/edit_referencing/edit_referencing_factory.cpp b/src/meshlabplugins/edit_referencing/edit_referencing_factory.cpp index fc8005ad9..8e117be1a 100644 --- a/src/meshlabplugins/edit_referencing/edit_referencing_factory.cpp +++ b/src/meshlabplugins/edit_referencing/edit_referencing_factory.cpp @@ -46,7 +46,7 @@ QList EditReferencingFactory::actions() const } //get the edit tool for the given action -EditPluginInterface* EditReferencingFactory::getMeshEditInterface(const QAction *action) +EditPlugin* EditReferencingFactory::getMeshEditInterface(const QAction *action) { if(action == editReferencing) { diff --git a/src/meshlabplugins/edit_referencing/edit_referencing_factory.h b/src/meshlabplugins/edit_referencing/edit_referencing_factory.h index b0f946941..2a561e907 100644 --- a/src/meshlabplugins/edit_referencing/edit_referencing_factory.h +++ b/src/meshlabplugins/edit_referencing/edit_referencing_factory.h @@ -27,11 +27,11 @@ #include #include -class EditReferencingFactory : public QObject, public EditPluginInterfaceFactory +class EditReferencingFactory : public QObject, public EditPluginFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) - Q_INTERFACES(EditPluginInterfaceFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) + Q_INTERFACES(EditPluginFactory) public: EditReferencingFactory(); @@ -43,7 +43,7 @@ public: virtual QList actions() const; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction*); + virtual EditPlugin* getMeshEditInterface(const QAction*); //get the description for the given action virtual QString getEditToolDescription(const QAction*); diff --git a/src/meshlabplugins/edit_sample/edit_sample.h b/src/meshlabplugins/edit_sample/edit_sample.h index 504e333ef..5fc9871f1 100644 --- a/src/meshlabplugins/edit_sample/edit_sample.h +++ b/src/meshlabplugins/edit_sample/edit_sample.h @@ -27,11 +27,11 @@ #include #include -class SampleEditPlugin : public QObject, public EditPluginInterface +class SampleEditPlugin : public QObject, public EditPlugin { Q_OBJECT MESHLAB_EDIT_PLUGIN - Q_INTERFACES(EditPluginInterface) + Q_INTERFACES(EditPlugin) public: SampleEditPlugin(); diff --git a/src/meshlabplugins/edit_sample/edit_sample_factory.cpp b/src/meshlabplugins/edit_sample/edit_sample_factory.cpp index d2ddf1e40..6ecc61508 100644 --- a/src/meshlabplugins/edit_sample/edit_sample_factory.cpp +++ b/src/meshlabplugins/edit_sample/edit_sample_factory.cpp @@ -46,7 +46,7 @@ QList SampleEditFactory::actions() const } //get the edit tool for the given action -EditPluginInterface* SampleEditFactory::getMeshEditInterface(const QAction *action) +EditPlugin* SampleEditFactory::getMeshEditInterface(const QAction *action) { if(action == editSample) { diff --git a/src/meshlabplugins/edit_sample/edit_sample_factory.h b/src/meshlabplugins/edit_sample/edit_sample_factory.h index 88809e894..b2b520621 100644 --- a/src/meshlabplugins/edit_sample/edit_sample_factory.h +++ b/src/meshlabplugins/edit_sample/edit_sample_factory.h @@ -28,11 +28,11 @@ #include #include -class SampleEditFactory : public QObject, public EditPluginInterfaceFactory +class SampleEditFactory : public QObject, public EditPluginFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) - Q_INTERFACES(EditPluginInterfaceFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) + Q_INTERFACES(EditPluginFactory) public: SampleEditFactory(); @@ -45,7 +45,7 @@ public: virtual QList actions() const; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction*); + virtual EditPlugin* getMeshEditInterface(const QAction*); //get the description for the given action virtual QString getEditToolDescription(const QAction*); diff --git a/src/meshlabplugins/edit_select/edit_select.h b/src/meshlabplugins/edit_select/edit_select.h index 84e6def76..3f2a2caa9 100644 --- a/src/meshlabplugins/edit_select/edit_select.h +++ b/src/meshlabplugins/edit_select/edit_select.h @@ -25,11 +25,11 @@ #include -class EditSelectPlugin : public QObject, public EditPluginInterface +class EditSelectPlugin : public QObject, public EditPlugin { Q_OBJECT MESHLAB_EDIT_PLUGIN - Q_INTERFACES(EditPluginInterface) + Q_INTERFACES(EditPlugin) public: diff --git a/src/meshlabplugins/edit_select/edit_select_factory.cpp b/src/meshlabplugins/edit_select/edit_select_factory.cpp index 07684e54a..bbe01d08d 100644 --- a/src/meshlabplugins/edit_select/edit_select_factory.cpp +++ b/src/meshlabplugins/edit_select/edit_select_factory.cpp @@ -52,7 +52,7 @@ QList EditSelectFactory::actions() const } //get the edit tool for the given action -EditPluginInterface* EditSelectFactory::getMeshEditInterface(const QAction *action) +EditPlugin* EditSelectFactory::getMeshEditInterface(const QAction *action) { if(action == editSelect) return new EditSelectPlugin(EditSelectPlugin::SELECT_FACE_MODE); diff --git a/src/meshlabplugins/edit_select/edit_select_factory.h b/src/meshlabplugins/edit_select/edit_select_factory.h index 2c1b1550b..3ee0998a3 100644 --- a/src/meshlabplugins/edit_select/edit_select_factory.h +++ b/src/meshlabplugins/edit_select/edit_select_factory.h @@ -27,11 +27,11 @@ #include -class EditSelectFactory : public QObject, public EditPluginInterfaceFactory +class EditSelectFactory : public QObject, public EditPluginFactory { Q_OBJECT - MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_INTERFACE_FACTORY_IID) - Q_INTERFACES(EditPluginInterfaceFactory) + MESHLAB_PLUGIN_IID_EXPORTER(EDIT_PLUGIN_FACTORY_IID) + Q_INTERFACES(EditPluginFactory) public: EditSelectFactory(); @@ -43,7 +43,7 @@ public: virtual QList actions() const; //get the edit tool for the given action - virtual EditPluginInterface* getMeshEditInterface(const QAction*); + virtual EditPlugin* getMeshEditInterface(const QAction*); //get the description for the given action virtual QString getEditToolDescription(const QAction*);