PR: Merge V1_2c etape 1

[modules/kernel.git] / src / SALOMEGUI / QAD_RightFrame.cxx

diff --git a/src/SALOMEGUI/QAD_RightFrame.cxx b/src/SALOMEGUI/QAD_RightFrame.cxx
index 477473451a64c0a5527f2c6318e017901d62aa83..200ecc5cb6d172ece754930f472ec51fad396905 100644 (file)
--- a/src/SALOMEGUI/QAD_RightFrame.cxx
+++ b/src/SALOMEGUI/QAD_RightFrame.cxx
@@ -74,6 +74,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libOCCViewer.dll" ;
 #else
@@ -93,6 +95,29 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
+#ifdef WNT
+      dir = dir + "libOCCViewer.dll" ;
+#else
+      dir = dir + "libOCCViewer.so" ;
+#endif
+      MESSAGE ( " GUI library = " << dir )
+      fileInfo.setFile(dir) ;
+      if (fileInfo.exists()) {
+       ComponentLib = fileInfo.fileName();
+       found = true;
+       MESSAGE (" Found ")
+      } else
+       MESSAGE (" Not found ")
+    }
+    
+    if ( (dir = getenv("KERNEL_ROOT_DIR")) && !found ) {
+      dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "lib" ;
+      dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libOCCViewer.dll" ;
 #else
@@ -113,6 +138,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libVTKViewer.dll" ;
 #else
@@ -132,6 +159,29 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
+#ifdef WNT
+      dir = dir + "libVTKViewer.dll" ;
+#else
+      dir = dir + "libVTKViewer.so" ;
+#endif
+      MESSAGE ( " GUI library = " << dir );
+      fileInfo.setFile(dir) ;
+      if (fileInfo.exists()) {
+       ComponentLib = fileInfo.fileName();
+       found = true;
+       MESSAGE (" Found ");
+      } else
+       MESSAGE (" Not found ");
+    }
+        
+    if ( (dir = getenv("KERNEL_ROOT_DIR")) && !found ) {
+      dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "lib" ;
+      dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libVTKViewer.dll" ;
 #else
@@ -151,6 +201,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libSUPERVGraph.dll" ;
 #else
@@ -170,6 +222,29 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
+#ifdef WNT
+      dir = dir + "libSUPERVGraph.dll" ;
+#else
+      dir = dir + "libSUPERVGraph.so" ;
+#endif
+      MESSAGE ( " GUI library = " << dir )
+      fileInfo.setFile(dir) ;
+      if (fileInfo.exists()) {
+       ComponentLib = fileInfo.fileName() ;
+       found = true;
+       MESSAGE (" Found ")
+      } else
+       MESSAGE (" Not found ")
+    }
+    
+    if ( (dir = getenv("KERNEL_ROOT_DIR")) && !found ) {
+      dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "lib" ;
+      dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libSUPERVGraph.dll" ;
 #else
@@ -189,6 +264,8 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libPlot2d.dll" ;
 #else
@@ -208,6 +285,29 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
+#ifdef WNT
+      dir = dir + "libPlot2d.dll" ;
+#else
+      dir = dir + "libPlot2d.so" ;
+#endif
+      MESSAGE ( " GUI library = " << dir )
+      fileInfo.setFile(dir) ;
+      if (fileInfo.exists()) {
+       ComponentLib = fileInfo.fileName() ;
+       found = true;
+       MESSAGE (" Found ")
+      } else
+       MESSAGE (" Not found ")
+    }
+    
+    if ( (dir = getenv("KERNEL_ROOT_DIR")) && !found ) {
+      dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "lib" ;
+      dir = QAD_Tools::addSlash(dir) ;
+      dir = dir + "salome" ;
+      dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libPlot2d.dll" ;
 #else