*** empty log message ***

diff --git a/src/EFICASGUI/EFICASGUI.py b/src/EFICASGUI/EFICASGUI.py
index f2429e851ba302c6fa92b53ba7962d2bd54abacc..df16a59b073bbe104a84b1d3a46d6fe761947d41 100644 (file)
--- a/src/EFICASGUI/EFICASGUI.py
+++ b/src/EFICASGUI/EFICASGUI.py
@@ -193,4 +193,5 @@ dict_command={
              
 #CS_pbruno temporaire
 import studyManager #from PAL
-palStudyManager = studyManager.SalomeStudy()
\ No newline at end of file
+#palStudyManager = studyManager.SalomeStudy()
+palStudyManager = studyManager.study
\ No newline at end of file

diff --git a/src/EFICASGUI/eficasSalome.py b/src/EFICASGUI/eficasSalome.py
index df20f668964c0e0c0f71fcb53e23226d78069cf6..9a7e19ffa0d4f30b334290a8a5ae631417a42301 100644 (file)
--- a/src/EFICASGUI/eficasSalome.py
+++ b/src/EFICASGUI/eficasSalome.py
@@ -25,7 +25,7 @@ sys.path[:0]=[os.path.join( eficasConfig.eficasPath,'Aster'),
               os.path.join( eficasConfig.eficasPath,'Editeur'),
               eficasConfig.eficasPath,
              ]
-print 'sys.path', sys.path
+
 
 import Tkinter
 
@@ -43,7 +43,9 @@ import salome
 import meshGui
 import studyManager
 
-from qxembed import QXEmbed
+#from qxembed import QXEmbed
+
+import SalomePyQt
 
 
 
@@ -389,29 +391,27 @@ class MyEficas( Tkinter.Toplevel, eficas.EFICAS ):
         
         
 #def runEficas( palStudyManager, code="ASTER", fichier=None, studyId=None):
-def runEficas( parent, palStudyManager, code="ASTER", fichier=None ):
+def runEficas( parent = SalomePyQt.SalomePyQt().getDesktop(), palStudyManager = studyManager.study, code="ASTER", fichier=None ):
     global appli    
     if not appli: #une seul instance possible!                        
         appli = MyEficas( parent, palStudyManager, code = code, fichier = fichier )
         
     
-def runHomard() :
-    print 'CS_pbruno non implémentée'
-    """
-    parent          = 
-    palStudyManager = 
-    runEficas( parent, palStudyManager, code="HOMARD"):
-    """
+def runHomard( parent = SalomePyQt.SalomePyQt().getDesktop(), palStudyManager = studyManager.study, code="HOMARD", fichier=None ):    
+    global appli    
+    if not appli: #une seul instance possible!                        
+        appli = MyEficas( parent, palStudyManager, code = code, fichier = fichier )
 
-def runAster() :
-    print 'CS_pbruno non implémentée'
-    """
-    parent          = 
-    palStudyManager = 
-    runEficas( parent, palStudyManager, code="ASTER"):
-    """
-    
+        
+"""        
+def runAster(parent = SalomePyQt.SalomePyQt().getDesktop(), palStudyManager = studyManager.study, code="ASTER", fichier=None ) :
+    global appli    
+    if not appli: #une seul instance possible!                        
+        appli = MyEficas( parent, palStudyManager, code = code, fichier = fichier )
+"""    
 
+    
+     
 # Init globale du module
 root = Tkinter.Tk()
 root.withdraw()