From: Pascale Noyret Date: Tue, 26 May 2009 09:57:14 +0000 (+0000) Subject: *** empty log message *** X-Git-Tag: V5_1_2~3 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=a4603f559cc742ea95e3019bb842d45f8854cd8d;p=modules%2Feficas.git *** empty log message *** --- diff --git a/resources/EFICAS_en.xml b/resources/EFICAS_en.xml index 21a4839a..baf6dc4c 100644 --- a/resources/EFICAS_en.xml +++ b/resources/EFICAS_en.xml @@ -16,9 +16,9 @@ + - - + @@ -26,16 +26,19 @@ - - - + + + - - + + + + + diff --git a/src/EFICASGUI/EFICASGUI.py b/src/EFICASGUI/EFICASGUI.py index f3ecb1cd..c8ece45b 100644 --- a/src/EFICASGUI/EFICASGUI.py +++ b/src/EFICASGUI/EFICASGUI.py @@ -149,6 +149,11 @@ def runEficaspourOpenturnsWrapper(): desktop=sgPyQt.getDesktop() eficasSalome.runEficas( "OPENTURNS_WRAPPER" ) +def runEficaspourOM(): + print "runEficas Pour Outils Metier" + desktop=sgPyQt.getDesktop() + eficasSalome.runEficas( "SEP" ) + def runEficasFichier(version=None): @@ -187,26 +192,23 @@ def runEficasFichier(version=None): eficasSalome.runEficas( code, fileName) -def runEficasFichierV8(): - runEficasFichier(version="v8.5") - -def runEficasFichierV9(): - runEficasFichier(version="v9.1") - print "hhhhhhhhhhhhhhhhhhhhhhhhhhhhh" # Partie applicative dict_command={ 941:runEficasFichier,# runEficas, - #946:runEficaspourHomard, + 942:runEficaspourOM,# runEficas, 947:runEficaspourOpenturnsStudy, 948:runEficaspourOpenturnsWrapper, + 4041:runEficasFichier, #runEficas, - 4046:runEficaspourHomard, + 4042:runEficaspourOM,# runEficas, 4047:runEficaspourOpenturnsStudy, 4048:runEficaspourOpenturnsWrapper, - 9042:runEficasFichier, - 9043:runEficasFichier, - 9044:runEficasFichierV9, + + 9041:runEficasFichier, + 9042:runEficaspourOM,# runEficas, + 9047:runEficaspourOpenturnsStudy, + 9048:runEficaspourOpenturnsWrapper, } diff --git a/src/EFICASGUI/eficasSalome.py b/src/EFICASGUI/eficasSalome.py index 29edd934..1325d455 100644 --- a/src/EFICASGUI/eficasSalome.py +++ b/src/EFICASGUI/eficasSalome.py @@ -40,6 +40,7 @@ sys.path[:0]=[eficasConfig.eficasPath, ASTER = "ASTER" HOMARD = "HOMARD" OPENTURNS = "OPENTURNS" +SEP = "SEP" import Editeur @@ -571,6 +572,7 @@ class MyEficas( qtEficas.Appli ): return ok, msgError fileType = { 'ASTER' : studyManager.FICHIER_EFICAS_ASTER, + 'SEP' : studyManager.FICHIER_EFICAS_OM , 'HOMARD' : studyManager.FICHIER_EFICAS_HOMARD , 'OPENTURNS': studyManager.FICHIER_EFICAS_OPENTURNS, 'OPENTURNS_STUDY': studyManager.FICHIER_EFICAS_OPENTURNS, @@ -578,11 +580,13 @@ class MyEficas( qtEficas.Appli ): folderName = { 'ASTER' : 'AsterFiles', 'HOMARD' : 'HomardFiles' , + 'SEP' : 'OMFiles' , 'OPENTURNS_STUDY': 'OpenturnsFiles', 'OPENTURNS_WRAPPER': 'OpenturnsFiles'} folderType = { 'ASTER': studyManager.ASTER_FILE_FOLDER, 'HOMARD': studyManager.ASTER_FILE_FOLDER, + 'SEP': studyManager.OM_FILE_FOLDER, 'OPENTURNS_STUDY': studyManager.OPENTURNS_FILE_FOLDER, 'OPENTURNS_WRAPPER': studyManager.OPENTURNS_FILE_FOLDER }