From 33706a528957b14b028e91fcb02bb39f859e87bd Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Fri, 3 Jul 2009 13:35:52 +0000 Subject: [PATCH] *** empty log message *** --- src/EFICASGUI/EFICASGUI.py | 14 +++----------- src/EFICASGUI/eficasSalome.py | 10 +--------- 2 files changed, 4 insertions(+), 20 deletions(-) diff --git a/src/EFICASGUI/EFICASGUI.py b/src/EFICASGUI/EFICASGUI.py index c8ece45b..87d00490 100644 --- a/src/EFICASGUI/EFICASGUI.py +++ b/src/EFICASGUI/EFICASGUI.py @@ -108,8 +108,7 @@ 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 \ - or aType == studyManager.FICHIER_EFICAS_HOMARD: + if aType == studyManager.FICHIER_EFICAS_ASTER : theObject="73" return (theContext, theObject, theParent) @@ -117,9 +116,6 @@ def definePopup(theContext, theObject, theParent): def customPopup(popup, theContext, theObject, theParent): print "EFICASGUI --- customPopup" -# popup.removeItem(99000) -# popup.removeItem(99001) -# popup.removeItem(99002) # popup.removeItem(99003) @@ -134,10 +130,6 @@ def runEficas(): eficasSalome.runEficas( "ASTER" ) -def runEficaspourHomard(): - print "runEficas" - desktop=sgPyQt.getDesktop() - eficasSalome.runEficas( "HOMARD" ) def runEficaspourOpenturnsStudy(): print "runEficas Pour Openturns Study" @@ -171,9 +163,9 @@ def runEficasFichier(version=None): if aType == studyManager.FICHIER_EFICAS_ASTER: fileName = aValue code = "ASTER" - elif aType == studyManager.FICHIER_EFICAS_HOMARD: + elif aType == studyManager.FICHIER_EFICAS_OM: fileName = aValue - code = "HOMARD" + code = "SEP" elif aType == studyManager.FICHIER_EFICAS_OPENTURNS: fileName = aValue code = "OPENTURNS" diff --git a/src/EFICASGUI/eficasSalome.py b/src/EFICASGUI/eficasSalome.py index 1325d455..63aacc64 100644 --- a/src/EFICASGUI/eficasSalome.py +++ b/src/EFICASGUI/eficasSalome.py @@ -33,6 +33,7 @@ sys.path[:0]=[eficasConfig.eficasPath, eficasConfig.eficasPath, ] +print sys.path @@ -47,16 +48,11 @@ import Editeur from InterfaceQT4 import qtEficas import salome -#import meshGui -#import PALGUI_API import studyManager import visuDriver import SalomePyQt -#from SelectMainShapeDiag_ui import SelectMainShapeDiag -#from SelectMeshDiag_ui import SelectMeshDiag - # message utilisateur @@ -179,7 +175,6 @@ class MyEficas( qtEficas.Appli ): pathCode=code[0]+code[1:].lower() sys.path[:0]=[os.path.join(eficasConfig.eficasPath,pathCode)] - print sys.path if Editeur.__dict__.has_key( 'session' ): from Editeur import session eficasArg = [] @@ -573,19 +568,16 @@ class MyEficas( qtEficas.Appli ): 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, 'OPENTURNS_WRAPPER': studyManager.FICHIER_EFICAS_OPENTURNS} 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 } -- 2.39.2