This commit was generated by cvs2git to create tag 'V1_4_0b2'.

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

diff --git a/src/SALOMEGUI/QAD_RightFrame.cxx b/src/SALOMEGUI/QAD_RightFrame.cxx
index 477473451a64c0a5527f2c6318e017901d62aa83..806a1503cf4a380319d3f93778e02d00c450a320 100644 (file)
--- a/src/SALOMEGUI/QAD_RightFrame.cxx
+++ b/src/SALOMEGUI/QAD_RightFrame.cxx
@@ -69,29 +69,12 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
   QCString dir;
   QFileInfo fileInfo ;
   bool found = false;
-  if (myViewType == VIEW_OCC) {
-    if ( dir = getenv("SALOME_SITE_DIR")) {
+  if (myViewType == VIEW_OCC) {    
+    if ( (dir = getenv("KERNEL_ROOT_DIR")) && !found ) {
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       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("SALOME_ROOT_DIR")) && !found ) {
-      dir = QAD_Tools::addSlash(dir) ;
-      dir = dir + "lib" ;
+      dir = dir + "salome" ;
       dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libOCCViewer.dll" ;
@@ -108,29 +91,11 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
        MESSAGE (" Not found ")
     }
   } else if (myViewType == VIEW_VTK) {
-    
-    if ( dir = getenv("SALOME_SITE_DIR")) {
+    if ( (dir = getenv("KERNEL_ROOT_DIR")) && !found ) {
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       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("SALOME_ROOT_DIR")) && !found ) {
-      dir = QAD_Tools::addSlash(dir) ;
-      dir = dir + "lib" ;
+      dir = dir + "salome" ;
       dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libVTKViewer.dll" ;
@@ -147,28 +112,11 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
        MESSAGE (" Not found ");
     }
   } else if (myViewType == VIEW_GRAPHSUPERV) {
-    if ( dir = getenv("SALOME_SITE_DIR")){
+    if ( (dir = getenv("KERNEL_ROOT_DIR")) && !found ) {
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       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("SALOME_ROOT_DIR")) && !found ) {
-      dir = QAD_Tools::addSlash(dir) ;
-      dir = dir + "lib" ;
+      dir = dir + "salome" ;
       dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libSUPERVGraph.dll" ;
@@ -185,28 +133,11 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
        MESSAGE (" Not found ")
     }
   } else if (myViewType == VIEW_PLOT2D) {
-    if ( dir = getenv("SALOME_SITE_DIR")){
+    if ( (dir = getenv("KERNEL_ROOT_DIR")) && !found ) {
       dir = QAD_Tools::addSlash(dir) ;
       dir = dir + "lib" ;
       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("SALOME_ROOT_DIR")) && !found ) {
-      dir = QAD_Tools::addSlash(dir) ;
-      dir = dir + "lib" ;
+      dir = dir + "salome" ;
       dir = QAD_Tools::addSlash(dir) ;
 #ifdef WNT
       dir = dir + "libPlot2d.dll" ;