]> SALOME platform Git repositories - tools/eficas.git/commitdiff
Salome HOME
*** empty log message *** mergeto_trunk_17mar08
authorPascale Noyret <pascale.noyret@edf.fr>
Mon, 4 Feb 2008 11:55:13 +0000 (11:55 +0000)
committerPascale Noyret <pascale.noyret@edf.fr>
Mon, 4 Feb 2008 11:55:13 +0000 (11:55 +0000)
src/EFICASGUI/EFICASGUI.py

index 6d6626f2c26a1155f655be5a5841ca4d40f7fb43..220ebcd4e79cec7d91c3d588ad01243ba86014b3 100644 (file)
@@ -122,7 +122,8 @@ def definePopup(theContext, theObject, theParent):
    selectedEntry = a[0]
    aType, aValue = studyManager.palStudy.getTypeAndValue( selectedEntry )
    
-   if aType == studyManager.FICHIER_EFICAS_ASTER or aType == studyManager.FICHIER_EFICAS_HOMARD:
+   if aType == studyManager.FICHIER_EFICAS_ASTER or aType == studyManager.FICHIER_EFICAS_HOMARD \
+      or aType == studyManager.FICHIER_EFICAS_HOMARD:
         theObject="73"    
             
    return (theContext, theObject, theParent)
@@ -169,13 +170,10 @@ def runEficaspourHomard():
    desktop=sgPyQt.getDesktop()
    eficasSalome.runEficas( "HOMARD" ) 
    
-   
-    
-def runEficasHomard():
-   print "runEficas"
-   #eficasSalome.runEficas("HOMARD")
-   #desktop=sgPyQt.getDesktop()
-   eficasSalome.runEficas( "HOMARD" )
+def runEficaspourOpenturns():
+   print "runEficas Pour Openturns"
+   desktop=sgPyQt.getDesktop()
+   eficasSalome.runEficas( "OPENTURNS" ) 
    
    
 
@@ -199,6 +197,9 @@ def runEficasFichier(version=None):
       elif aType == studyManager.FICHIER_EFICAS_HOMARD:        
         fileName = aValue
         code     = "HOMARD"
+      elif aType == studyManager.FICHIER_EFICAS_OPENTURNS:        
+        fileName = aValue
+        code     = "OPENTURNS"
       else:
         fileName=None
         code = "ASTER"
@@ -225,8 +226,10 @@ def runEficasFichierV9():
 dict_command={
                 941:runEficasFichier,# runEficas,
                 946:runEficaspourHomard,
+                946:runEficaspourOpenturns,
                 4041:runEficasFichier, #runEficas,
                 4046:runEficaspourHomard,
+                4047:runEficaspourOpenturns,
                 9042:runEficasFichier,
                 9043:runEficasFichierV8,
                 9044:runEficasFichierV9,