From: Renaud Barate <renaud.barate@edf.fr>
Date: Mon, 11 Oct 2010 12:33:34 +0000 (+0000)
Subject: Removed dependency on PAL module
X-Git-Tag: V5_1_5~7
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d3ef2c97676c042894e4c373ee3dd42ae738ccc6;p=modules%2Feficas.git

Removed dependency on PAL module
---

diff --git a/adm_local/unix/config_files/check_pal.m4 b/adm_local/unix/config_files/check_pal.m4
deleted file mode 100644
index 1a4c55c6..00000000
--- a/adm_local/unix/config_files/check_pal.m4
+++ /dev/null
@@ -1,50 +0,0 @@
-# Check availability of Salome's PAL binary distribution
-#
-# Author : Guillaume Boulant (CSSI - 03/08/2005)
-#
-
-AC_DEFUN([CHECK_PAL],[
-
-AC_CHECKING(for Pal)
-
-pal_ok=no
-
-AC_ARG_WITH(pal,
-	    [  --with-pal=DIR               root directory path of PAL build or installation],
-	    PAL_DIR="$withval",PAL_DIR="")
-
-if test "x$PAL_DIR" = "x" ; then
-
-# no --with-pal-dir option used
-
-   if test "x$PAL_ROOT_DIR" != "x" ; then
-
-    # PAL_ROOT_DIR environment variable defined
-      PAL_DIR=$PAL_ROOT_DIR
-
-   else
-      AC_MSG_WARN("PAL_ROOT_DIR is not defined")
-   fi
-fi
-
-if test -f ${PAL_DIR}/bin/salome/testAppli ; then
-   pal_ok=yes
-   AC_MSG_RESULT(Using Pal module distribution in ${PAL_DIR})
-
-   if test "x$PAL_ROOT_DIR" = "x" ; then
-      PAL_ROOT_DIR=${PAL_DIR}
-   fi
-   if test "x$PAL_SITE_DIR" = "x" ; then
-      PAL_SITE_DIR=${PAL_ROOT_DIR}
-   fi
-   AC_SUBST(PAL_ROOT_DIR)
-   AC_SUBST(PAL_SITE_DIR)
-
-else
-   AC_MSG_WARN("Cannot find compiled Pal module distribution")
-fi
-
-AC_MSG_RESULT(for Pal: $pal_ok)
- 
-])dnl
- 
diff --git a/configure.in b/configure.in
index 5350eb97..4bf96dee 100644
--- a/configure.in
+++ b/configure.in
@@ -146,14 +146,6 @@ echo
 
 CHECK_SALOME_GUI
 
-echo
-echo ---------------------------------------------
-echo Testing Pal
-echo ---------------------------------------------
-echo
-
-CHECK_PAL
-
 echo
 echo ---------------------------------------------
 echo Testing Visu
@@ -185,7 +177,7 @@ echo ---------------------------------------------
 echo RunTime Dependencies
 echo ---------------------------------------------
 echo
-variables="Visu_ok pal_ok"
+variables="Visu_ok"
 
 for var in $variables
 do
diff --git a/configure.in.base b/configure.in.base
index 0f2558cf..fd489c87 100644
--- a/configure.in.base
+++ b/configure.in.base
@@ -146,14 +146,6 @@ echo
 
 CHECK_SALOME_GUI
 
-echo
-echo ---------------------------------------------
-echo Testing Pal
-echo ---------------------------------------------
-echo
-
-CHECK_PAL
-
 echo
 echo ---------------------------------------------
 echo Testing Visu
@@ -185,7 +177,7 @@ echo ---------------------------------------------
 echo RunTime Dependencies
 echo ---------------------------------------------
 echo
-variables="Visu_ok pal_ok"
+variables="Visu_ok"
 
 for var in $variables
 do
diff --git a/src/EFICASGUI/EFICASGUI.py b/src/EFICASGUI/EFICASGUI.py
index 9ba7b85b..e721b5f1 100644
--- a/src/EFICASGUI/EFICASGUI.py
+++ b/src/EFICASGUI/EFICASGUI.py
@@ -11,7 +11,7 @@ from PyQt4.QtCore import *
 import salome
 import SalomePyQt
 
-from pal.studyedit import getStudyEditor
+from salome.kernel.studyedit import getStudyEditor
 
 sgPyQt=SalomePyQt.SalomePyQt()
 
diff --git a/src/EFICASGUI/eficasSalome.py b/src/EFICASGUI/eficasSalome.py
index 0b9486fd..3857853f 100644
--- a/src/EFICASGUI/eficasSalome.py
+++ b/src/EFICASGUI/eficasSalome.py
@@ -4,8 +4,8 @@
 import sys, os, re,types
 from PyQt4.QtGui import QMessageBox
 
-from pal.logger import ExtLogger
-logger=ExtLogger( "EFICAS_SRC.EFICASGUI.eficasSalome.py" )
+from salome.kernel.logger import Logger
+logger = Logger( "EFICAS_SRC.EFICASGUI.eficasSalome.py" )
 
 import eficasConfig 
 # eficasConfig definit le EFICAS_ROOT
@@ -28,8 +28,8 @@ import salome
 import SalomePyQt
 
 
-from pal.studyedit import getStudyEditor
-from pal.structelem import StructuralElementManager, InvalidParameterError
+from salome.kernel.studyedit import getStudyEditor
+from salome.geom.structelem import StructuralElementManager, InvalidParameterError
 
 
 # couleur pour visualisation des geometries 
@@ -266,7 +266,7 @@ class MyEficas( qtEficas.Appli ):
         name, msgError = '',''
 
         mySO=self.editor.study.FindObjectID(selectedEntry )
-        from pal.smeshstudytools import SMeshStudyTools
+        from salome.smesh.smeshstudytools import SMeshStudyTools
         monSMeshStudyTools=SMeshStudyTools(self.editor)
         meshSO = monSMeshStudyTools.getMeshFromGroup(mySO)
         if meshSO == None : return name, msgError    
@@ -457,7 +457,7 @@ class MyEficas( qtEficas.Appli ):
                 ok, msgError = True, ''        
         except Exception, exc:
             msgError = "Can't add Eficas file to Salome study tree"
-            logger.exception(msgError)
+            logger.debug(msgError, exc_info = True)
             QMessageBox.warning(self, self.tr("Warning"),
                                 self.tr("%s. Reason:\n%s\n\nSee logs for "
                                         "more details." % (msgError, exc)))
@@ -494,7 +494,7 @@ class MyEficas( qtEficas.Appli ):
                 ok, msgError = self.displayMeshGroups(shapeName)
             else: #geometrie
                 current_color = COLORS[ self.icolor % LEN_COLORS ]                
-                from pal.geomtools import GeomStudyTools
+                from salome.geom.geomtools import GeomStudyTools
                 myGeomTools=GeomStudyTools(self.editor)
                 ok = myGeomTools.displayShapeByName( shapeName, current_color )
                 salome.sg.FitAll()
diff --git a/src/STUDY/EficasStudy.py b/src/STUDY/EficasStudy.py
index 8183cc2f..5570f798 100644
--- a/src/STUDY/EficasStudy.py
+++ b/src/STUDY/EficasStudy.py
@@ -12,7 +12,7 @@ try :
 except :
     pass
 
-from pal.logger import Logger
+from salome.kernel.logger import Logger
 logger=Logger( "EficasStudy" )