Fix bug of the "Show Only/Hide All" operations : do not raise warning message for...

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index 896a9a499482e08843ae0a8f9a867bdd8a40eec1..354394bfb53e3efe7576061e6f1f8295667ba5c8 100755 (executable)
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -257,7 +257,7 @@ void CAM_Application::loadModules()
   \param modName module name
   \return module object pointer or 0 if module could not be loaded
 */
-CAM_Module* CAM_Application::loadModule( const QString& modName )
+CAM_Module* CAM_Application::loadModule( const QString& modName, const bool showMsg )
 {
   if ( myInfoList.isEmpty() )
   {
@@ -316,7 +316,7 @@ CAM_Module* CAM_Application::loadModule( const QString& modName )
     module->setName( moduleName( modName ) );
   }
 
-  if ( !err.isEmpty() ) {
+  if ( !err.isEmpty() && showMsg ) {
     if ( desktop() && desktop()->isVisible() )
       SUIT_MessageBox::warning( desktop(), tr( "Error" ), err );
     else

diff --git a/src/CAM/CAM_Application.h b/src/CAM/CAM_Application.h
index f77808c1dcceb88a063b4ad76ca1f45d3511d86c..5ce540555e89d284dc6224aba22761ad166cac3f 100755 (executable)
--- a/src/CAM/CAM_Application.h
+++ b/src/CAM/CAM_Application.h
@@ -57,7 +57,7 @@ public:
   virtual void        addModule( CAM_Module* );
 
   virtual void        loadModules();
-  virtual CAM_Module* loadModule( const QString& );
+  virtual CAM_Module* loadModule( const QString&, const bool = true );
 
   virtual bool        activateModule( const QString& );
 

diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index 9f606e478cf2a7511e1533ef6c4d5156cd036824..2b81c7a0b71f1ba8a724b09b2b445cc205b839dd 100644 (file)
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -372,9 +372,9 @@ QString LightApp_Application::applicationVersion() const
 }
 
 /*!Load module by \a name.*/
-CAM_Module* LightApp_Application::loadModule( const QString& name )
+CAM_Module* LightApp_Application::loadModule( const QString& name, const bool showMsg )
 {
-  CAM_Module* mod = CAM_Application::loadModule( name );
+  CAM_Module* mod = CAM_Application::loadModule( name, showMsg );
   if ( mod )
   {
     connect( this, SIGNAL( studyOpened() ), mod, SLOT( onModelOpened() ) );

diff --git a/src/LightApp/LightApp_Application.h b/src/LightApp/LightApp_Application.h
index 0763e2a3f136e6bfe88b2bfcd8cd731c056331b7..7f17879092ff70efc975cf05008fd2bc8c3ccaa9 100644 (file)
--- a/src/LightApp/LightApp_Application.h
+++ b/src/LightApp/LightApp_Application.h
@@ -93,7 +93,7 @@ public:
   virtual QString                     applicationName() const;
   virtual QString                     applicationVersion() const;
 
-  virtual CAM_Module*                 loadModule( const QString& );
+  virtual CAM_Module*                 loadModule( const QString&, const bool = true );
   virtual bool                        activateModule( const QString& );
 
   LightApp_SelectionMgr*              selectionMgr() const;

diff --git a/src/LightApp/LightApp_Displayer.cxx b/src/LightApp/LightApp_Displayer.cxx
index 7f0efa250f404bc704cdbb9b29c2f6f45011f9ff..c050811d1ebf4b85e96cf79d881bb30f6fe81f08 100644 (file)
--- a/src/LightApp/LightApp_Displayer.cxx
+++ b/src/LightApp/LightApp_Displayer.cxx
@@ -257,7 +257,7 @@ LightApp_Displayer* LightApp_Displayer::FindDisplayer( const QString& mod_name,
   LightApp_Module* m = dynamic_cast<LightApp_Module*>( app ? app->module( mod_name ) : 0 );
   if( !m && load )
   {
-    m = dynamic_cast<LightApp_Module*>( app->loadModule( mod_name ) );
+    m = dynamic_cast<LightApp_Module*>( app->loadModule( mod_name, false ) );
     if( m )
       app->addModule( m );
   }