X-Git-Url: https://git.creatis.insa-lyon.fr/pubgit/?a=blobdiff_plain;f=lib%2FcpPipelineEditor%2FBaseQtMainWindow.cxx;h=8a9536b70ddf79140508e03bee159619b021eec3;hb=24d0c2ad34de2cbd89fed76058f2995cdf81d239;hp=b600c0ee12002dc33e7c09d49fec0a8cc5bf2ec7;hpb=8b6eaedb25048704cb0a1a3fa1dd751c4fb25db4;p=cpPlugins.git diff --git a/lib/cpPipelineEditor/BaseQtMainWindow.cxx b/lib/cpPipelineEditor/BaseQtMainWindow.cxx index b600c0e..8a9536b 100644 --- a/lib/cpPipelineEditor/BaseQtMainWindow.cxx +++ b/lib/cpPipelineEditor/BaseQtMainWindow.cxx @@ -45,14 +45,10 @@ BaseQtMainWindow( { this->m_Interface.GuessAccesiblePlugins( ); + // Try to load plugins from executable dir QFileInfo info( argv[ 0 ] ); if( info.exists( ) ) - { - auto exec_dir = info.canonicalPath( ).toStdString( ); - this->_LoadPluginsFromPath( exec_dir ); - - } // fi - this->_UpdateLoadedPlugins( ); + this->_LoadPluginsFromPath( info.canonicalPath( ).toStdString( ) ); // Prepare workspace this->m_Workspace.SetInterface( &( this->m_Interface ) ); @@ -187,7 +183,6 @@ _UpdateLoadedPlugins( ) } // fi this->_UnBlock( ); - this->m_Interface.SaveConfiguration( cpPlugins_CONFIG_FILE ); } // ------------------------------------------------------------------------- @@ -250,9 +245,9 @@ _InteractiveLoadPlugins( ) dlg.setDirectory( this->m_PluginsPath.c_str( ) ); std::stringstream name_filter; - std::string suffix = std::string( cpPlugins_PLUGIN_EXT ); + std::string suffix = std::string( cpPlugins_LIB_EXT ); name_filter - << "Plugins file (*." << cpPlugins_PLUGIN_EXT << ");;All files (*)"; + << "Plugins file (*." << cpPlugins_LIB_EXT << ");;All files (*)"; dlg.setNameFilter( name_filter.str( ).c_str( ) ); dlg.setDefaultSuffix( suffix.c_str( ) ); if( !( dlg.exec( ) ) )