merge from V3_2_0_maintenance 17mar08

[modules/eficas.git] / src / STUDY / EficasStudy.py

diff --git a/src/STUDY/EficasStudy.py b/src/STUDY/EficasStudy.py
index 4c94c26b6332e6027d9cca4b45f02715b885ebcc..2461546328cf6fde6d6aeaf1807cc661f8fde504 100644 (file)
--- a/src/STUDY/EficasStudy.py
+++ b/src/STUDY/EficasStudy.py
@@ -3,8 +3,14 @@ import salomedsgui
 import salome
 
 import SALOMEDS
-import GEOM
-import SMESH
+try :
+    import SMESH
+except :
+    pass
+try :
+    import SMESH
+except :
+    pass
 
 from Logger import Logger
 logger=Logger( "EficasStudy" )
@@ -258,8 +264,8 @@ class SalomeStudy(   salomedsgui.guiDS ):
             import sys
             type        = sys.exc_info()[0]
             value       = sys.exc_info()[1]            
-            print '>>>>CS_Pbruno StudyTree.getMainShapeEntry( entry = %s ) ' %entry
-            print 'type        = %s ,             value       = %s '%( type, value )
+            #print '>>>>CS_Pbruno StudyTree.getMainShapeEntry( entry = %s ) ' %entry
+            #print 'type        = %s ,             value       = %s '%( type, value )
             result = None
            
         return result
@@ -289,8 +295,8 @@ class SalomeStudy(   salomedsgui.guiDS ):
             import sys
             type        = sys.exc_info()[0]
             value       = sys.exc_info()[1]            
-            print '>>>>CS_Pbruno StudyTree.sameMainShape(  shapeEntry1 = %s , shapeEntry2 = %s )'%( shapeEntry1, shapeEntry2 )
-            print 'type        = %s ,             value       = %s '%( type, value )
+            #print '>>>>CS_Pbruno StudyTree.sameMainShape(  shapeEntry1 = %s , shapeEntry2 = %s )'%( shapeEntry1, shapeEntry2 )
+            #print 'type        = %s ,             value       = %s '%( type, value )
             result = None
            
         return result