diff --git a/src/common/globals.cpp b/src/common/globals.cpp index a9387c772..dd5a97a34 100644 --- a/src/common/globals.cpp +++ b/src/common/globals.cpp @@ -109,8 +109,8 @@ RichParameterList& meshlab::defaultGlobalParameterList() return globalRPS; } -PluginManager& meshlab::pluginManagerInstance(bool verbose) +PluginManager& meshlab::pluginManagerInstance() { - static PluginManager pm(defaultGlobalParameterList(), verbose); + static PluginManager pm; return pm; } diff --git a/src/common/globals.h b/src/common/globals.h index 7246cb38a..8f534fad7 100644 --- a/src/common/globals.h +++ b/src/common/globals.h @@ -35,7 +35,7 @@ QString defaultPluginPath(); QString defaultShadersPath(); RichParameterList& defaultGlobalParameterList(); -PluginManager& pluginManagerInstance(bool verbose = true); +PluginManager& pluginManagerInstance(); } diff --git a/src/common/plugin_manager.cpp b/src/common/plugin_manager.cpp index 632fb3e4b..adfa360dc 100644 --- a/src/common/plugin_manager.cpp +++ b/src/common/plugin_manager.cpp @@ -58,16 +58,6 @@ PluginManager::PluginManager() { } -PluginManager::PluginManager(RichParameterList& defaultGlobal, bool verbose) -{ - loadPlugins(defaultGlobal, verbose); -} - -PluginManager::PluginManager(RichParameterList& defaultGlobal, const QDir& pluginsDirectory, bool verbose) -{ - loadPlugins(defaultGlobal, pluginsDirectory, verbose); -} - PluginManager::~PluginManager() { ioMeshPlugins.clear(); @@ -85,12 +75,12 @@ PluginManager::~PluginManager() -void PluginManager::loadPlugins(RichParameterList& defaultGlobal, bool verbose) +void PluginManager::loadPlugins(bool verbose) { - loadPlugins(defaultGlobal, QDir(meshlab::defaultPluginPath()), verbose); + loadPlugins(QDir(meshlab::defaultPluginPath()), verbose); } -void PluginManager::loadPlugins(RichParameterList& defaultGlobal, const QDir& pluginsDirectory, bool verbose) +void PluginManager::loadPlugins(const QDir& pluginsDirectory, bool verbose) { pluginsDir = pluginsDirectory; // without adding the correct library path in the mac the loading of jpg (done via qt plugins) fails @@ -171,7 +161,7 @@ void PluginManager::loadPlugins(RichParameterList& defaultGlobal, const QDir& pl decoratePlugins.push_back(iDecorator); for(QAction *decoratorAction : iDecorator->actions()) { - iDecorator->initGlobalParameterList(decoratorAction, defaultGlobal); + iDecorator->initGlobalParameterList(decoratorAction, meshlab::defaultGlobalParameterList()); } } diff --git a/src/common/plugin_manager.h b/src/common/plugin_manager.h index 1fae5a576..dbe6d76fb 100644 --- a/src/common/plugin_manager.h +++ b/src/common/plugin_manager.h @@ -42,12 +42,10 @@ class PluginManager { public: PluginManager(); - PluginManager(RichParameterList& defaultGlobal, bool verbose = false); - PluginManager(RichParameterList& defaultGlobal, const QDir& pluginsDirectory, bool verbose = false); - ~PluginManager(); - void loadPlugins(RichParameterList& defaultGlobal, bool verbose = false); - void loadPlugins(RichParameterList& defaultGlobal, const QDir& pluginsDirectory, bool verbose = false); + + void loadPlugins(bool verbose = false); + void loadPlugins(const QDir& pluginsDirectory, bool verbose = false); QString pluginsCode() const; unsigned int size() const; diff --git a/src/meshlab/mainwindow_Init.cpp b/src/meshlab/mainwindow_Init.cpp index 2f5bc639b..2c685b3fb 100644 --- a/src/meshlab/mainwindow_Init.cpp +++ b/src/meshlab/mainwindow_Init.cpp @@ -63,6 +63,7 @@ MainWindow::MainWindow(): layerDialog->setAllowedAreas(Qt::LeftDockWidgetArea | Qt::RightDockWidgetArea); layerDialog->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Minimum); addDockWidget(Qt::RightDockWidgetArea, layerDialog); + PM.loadPlugins(); //setCentralWidget(workspace);