X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FSALOMEGUI%2FQAD_RightFrame.cxx;h=1dea45a20aa9607f7d416951524bef3b1cc921d4;hb=e2926da4bf6c85b85058a717ecd523a03ccea90d;hp=feb272649d9596166bdfc382afffd354cc0ff0b4;hpb=61d4fc88c862e718985aa6e9b1bf72f055553eee;p=modules%2Fkernel.git

diff --git a/src/SALOMEGUI/QAD_RightFrame.cxx b/src/SALOMEGUI/QAD_RightFrame.cxx
index feb272649..1dea45a20 100644
--- a/src/SALOMEGUI/QAD_RightFrame.cxx
+++ b/src/SALOMEGUI/QAD_RightFrame.cxx
@@ -1,12 +1,32 @@
-using namespace std;
-//  File      : QAD_RightFrame.cxx
-//  Created   : Thu Jun 14 14:51:52 2001
-//  Author    : Nicolas REJNERI
-//  Project   : SALOME
-//  Module    : SALOMEGUI
-//  Copyright : Open CASCADE
+//  SALOME SALOMEGUI : implementation of desktop and GUI kernel
+//
+//  Copyright (C) 2003  OPEN CASCADE, EADS/CCR, LIP6, CEA/DEN,
+//  CEDRAT, EDF R&D, LEG, PRINCIPIA R&D, BUREAU VERITAS 
+// 
+//  This library is free software; you can redistribute it and/or 
+//  modify it under the terms of the GNU Lesser General Public 
+//  License as published by the Free Software Foundation; either 
+//  version 2.1 of the License. 
+// 
+//  This library is distributed in the hope that it will be useful, 
+//  but WITHOUT ANY WARRANTY; without even the implied warranty of 
+//  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU 
+//  Lesser General Public License for more details. 
+// 
+//  You should have received a copy of the GNU Lesser General Public 
+//  License along with this library; if not, write to the Free Software 
+//  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA 
+// 
+//  See http://www.opencascade.org/SALOME/ or email : webmaster.salome@opencascade.org 
+//
+//
+//
+//  File   : QAD_RightFrame.cxx
+//  Author : Nicolas REJNERI
+//  Module : SALOME
 //  $Header$
 
+using namespace std;
 #include "QAD_RightFrame.h"
 #include "QAD_Application.h"
 #include "QAD_Desktop.h"
@@ -54,8 +74,6 @@ 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
@@ -75,6 +93,25 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       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("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
@@ -97,8 +134,6 @@ 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
@@ -118,6 +153,25 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       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("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
@@ -139,8 +193,6 @@ 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
@@ -160,6 +212,25 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       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("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
@@ -181,8 +252,6 @@ 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
@@ -202,6 +271,25 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
       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("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
@@ -257,12 +345,12 @@ QAD_RightFrame::QAD_RightFrame(QWidget *parent, const char *name,
   myMessage  = new QAD_Message( vsplitter ,"Message");  
   myMessage->setMinimumSize( 1, 1 );
 
-  sizes.append( 0.48 * DesktopHeight );
-  sizes.append( 0.16 * DesktopHeight );
+  sizes.append( (int)(0.48 * DesktopHeight) );
+  sizes.append( (int)(0.16 * DesktopHeight) );
   setSizes( sizes );
   sizes.clear();
-  sizes.append( 0.25 * DesktopWidth );
-  sizes.append( 0.25 * DesktopWidth );
+  sizes.append( (int)(0.25 * DesktopWidth) );
+  sizes.append( (int)(0.25 * DesktopWidth) );
   vsplitter->setSizes( sizes );
 }