From: mzn <mzn@opencascade.com>
Date: Thu, 17 Aug 2006 14:57:12 +0000 (+0000)
Subject: Fix for bug PAL12445 (No trace when a component is not loaded).
X-Git-Tag: V3_2_2pre~9
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=5747110ff5180d067d53c79bde69f45b5a7404f6;p=modules%2Fgui.git

Fix for bug PAL12445 (No trace when a component is not loaded).
---

diff --git a/src/CAM/CAM_Application.cxx b/src/CAM/CAM_Application.cxx
index baabb3970..cc2d1f703 100755
--- a/src/CAM/CAM_Application.cxx
+++ b/src/CAM/CAM_Application.cxx
@@ -467,7 +467,13 @@ void CAM_Application::readModuleList()
 
     QString modTitle = resMgr->stringValue( *it, QString( "name" ), QString::null );
     if ( modTitle.isEmpty() )
-      continue;
+      {
+	printf( "****************************************************************\n" );
+	printf( "*    Warning: %s not found in resources.\n", (*it).latin1() );
+	printf( "*    Module will not be available\n" );
+	printf( "****************************************************************\n" );
+	continue;
+      }
 
     QString modLibrary = resMgr->stringValue( *it, QString( "library" ), QString::null ).stripWhiteSpace();
     if ( !modLibrary.isEmpty() )
@@ -499,7 +505,11 @@ void CAM_Application::readModuleList()
     if ( desktop() && desktop()->isShown() )
       SUIT_MessageBox::warn1( desktop(), tr( "Warning" ), tr( "Modules list is empty" ), tr( "&OK" ) );
     else
-      qWarning( tr( "Modules list is empty" ).latin1() ); 
+      {
+	printf( "****************************************************************\n" );
+	printf( "*    Warning: modules list is empty.\n" );
+	printf( "****************************************************************\n" );
+      }
   }
 }
 
diff --git a/src/LightApp/LightApp_Application.cxx b/src/LightApp/LightApp_Application.cxx
index bdc296e91..ab5e1e597 100644
--- a/src/LightApp/LightApp_Application.cxx
+++ b/src/LightApp/LightApp_Application.cxx
@@ -553,11 +553,8 @@ void LightApp_Application::createActions()
   for ( it = modList.begin(); it != modList.end(); ++it )
   {
     if ( !isLibExists( *it ) )
-    {
-      qDebug( QString( "Library '%1' cannot be found" ).arg( *it ) );
       continue;
-    }
-
+    
     QString iconName;
     if ( iconMap.contains( *it ) )
       iconName = iconMap[*it];
@@ -566,7 +563,12 @@ void LightApp_Application::createActions()
 
     QPixmap icon = resMgr->loadPixmap( modName, iconName, false );
     if ( icon.isNull() )
-      icon = modIcon;
+      {
+	icon = modIcon;
+	printf( "****************************************************************\n" );
+	printf( "*    Icon for %s not found. Using the default one.\n", (*it).latin1() );
+	printf( "****************************************************************\n" );
+      }
 
     icon.convertFromImage( icon.convertToImage().smoothScale( iconSize, iconSize, QImage::ScaleMin ) );
 
@@ -2327,11 +2329,14 @@ void LightApp_Application::onRenameWindow()
   \param moduleTitle - title of module
 */
 bool LightApp_Application::isLibExists( const QString& moduleTitle ) const
-{
+{ 
   if( moduleTitle.isEmpty() )
     return false;
 
   QString lib = moduleLibrary( moduleTitle );
+  
+  bool isPythonModule = lib.contains("libSalomePyQtGUI");
+
   QStringList paths;
 #ifdef WIN32
   paths = QStringList::split( ";", ::getenv( "PATH" ) );
@@ -2339,13 +2344,67 @@ bool LightApp_Application::isLibExists( const QString& moduleTitle ) const
   paths = QStringList::split( ":", ::getenv( "LD_LIBRARY_PATH" ) );
 #endif
 
+  bool isLibFound = false;
   QStringList::const_iterator anIt = paths.begin(), aLast = paths.end();
   for( ; anIt!=aLast; anIt++ )
   {
     QFileInfo inf( Qtx::addSlash( *anIt ) + lib );
+    
     if( inf.exists() )
-      return true;
+      {
+	isLibFound = true;
+	break;
+      }
   }
+  
+  if ( !isLibFound )
+    {
+      printf( "****************************************************************\n" );
+      printf( "*    Warning: library %s cannot be found\n", moduleTitle.latin1() );
+      printf( "*    Module will not be available\n" );
+      printf( "****************************************************************\n" );
+    }
+  else if ( !isPythonModule )
+    return true;
+
+  if ( isPythonModule )
+    {
+      QString pylib = moduleName( moduleTitle ) + QString(".py");
+      QString pylibgui = moduleName( moduleTitle ) + QString("GUI.py");
+
+      // Check the python library
+#ifdef WIN32
+      paths = QStringList::split( ";", ::getenv( "PATH" ) );
+#else
+      paths = QStringList::split( ":", ::getenv( "PYTHONPATH" ) );
+#endif
+      bool isPyLib = false, isPyGuiLib = false;
+      QStringList::const_iterator anIt = paths.begin(), aLast = paths.end();
+      for( ; anIt!=aLast; anIt++ )
+	{
+	  QFileInfo inf( Qtx::addSlash( *anIt ) + pylib );
+	  QFileInfo infgui( Qtx::addSlash( *anIt ) + pylibgui );
+    
+	  if( !isPyLib && inf.exists() )
+	    isPyLib = true;
+	  
+	  if( !isPyGuiLib && infgui.exists() )
+	    isPyGuiLib = true;
+	  
+	  if ( isPyLib && isPyGuiLib && isLibFound)
+	    return true;
+	}
+      
+      printf( "****************************************************************\n" );
+      printf( "*    Warning: python library for %s cannot be found:\n", moduleTitle.latin1() );
+      if (!isPyLib)
+	printf( "*    No module named %s\n", moduleName( moduleTitle ).latin1() );
+      if (!isPyGuiLib)
+	printf( "*    No module named %s\n", (moduleName( moduleTitle ) + QString("GUI")).latin1() );
+      printf( "****************************************************************\n" );
+      return true;
+    }
+  
   return false;
 }