From 0b544399e15babb053c0051e1fdd71492fddec7f Mon Sep 17 00:00:00 2001 From: Pascale Noyret Date: Thu, 1 Apr 2010 09:11:26 +0000 Subject: [PATCH] *** empty log message *** --- CMakeLists.txt | 26 +++++++++++++++++--- Ihm/I_JDC.py | 21 +++++++++++------ InterfaceQT4/CMakeLists.txt | 42 +++++++++++++++++++++++++++++---- InterfaceQT4/monMatricePanel.py | 5 +++- convert/CMakeLists.txt | 6 +++++ generator/CMakeLists.txt | 11 +++++++-- 6 files changed, 94 insertions(+), 17 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ecac2706..d857d15d 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -78,14 +78,24 @@ endif (NOT PYUIC4) # Definition des options de CMake option ( WITH_ALL_PACKAGES "Install all package files" OFF ) +option ( WITH_SALOME_MECA "Install OT, Aster and SEP files" OFF ) option ( WITH_OPENTURNS "Install Open TURNS files" OFF ) option ( WITH_ASTER "Install Aster files" OFF ) option ( WITH_MAP "Install MAP files" OFF ) +option ( WITH_SEP "Install SEP files" OFF ) set ( _OPTIONLIST WITH_OPENTURNS WITH_ASTER WITH_MAP + WITH_SEP + WITH_SALOME_MECA + ) + +set ( _SALOME_MECA_LIST) + WITH_OPENTURNS + WITH_ASTER + WITH_SEP ) if (WITH_ALL_PACKAGES) @@ -94,6 +104,12 @@ if (WITH_ALL_PACKAGES) endforeach ( _opt ) endif (WITH_ALL_PACKAGES) +if (WITH_SALOME_MECA) + foreach ( _opt ${_SALOME_MECA_LIST} ) + set ( ${_opt} ON ) + endforeach ( _opt ) +endif (WITH_SALOME_MECA) + # Verification: au moins une option doit etre selectionnee set ( _VALIDOPT FALSE ) foreach ( _opt ${_OPTIONLIST} ) @@ -141,15 +157,19 @@ if (WITH_OPENTURNS) endif (WITH_OPENTURNS) # Installation des fichiers : Aster -#if (WITH_ASTER) -# add_subdirectory ( Aster ) -#endif (WITH_ASTER) +if (WITH_ASTER) + add_subdirectory ( Aster ) +endif (WITH_ASTER) # Installation des fichiers : MAP if (WITH_MAP) add_subdirectory ( MAP ) endif (WITH_MAP) +# Installation des fichiers : Sep +if (WITH_SEP) + add_subdirectory ( Sep ) +endif (WITH_SEP) ### Local Variables: ### mode: cmake diff --git a/Ihm/I_JDC.py b/Ihm/I_JDC.py index ed87c542..600e8d0a 100644 --- a/Ihm/I_JDC.py +++ b/Ihm/I_JDC.py @@ -88,17 +88,24 @@ class JDC(I_OBJECT.OBJECT): def set_Copules_recalcule_etat(self): for etapeTraitee in self.etapes : if etapeTraitee.nom == 'CORRELATION' : - copule=etapeTraitee.get_child('Copula') - if copule !=None : - copule.state='arecalculer' + Matrix=etapeTraitee.get_child('Matrix') + if Matrix !=None : + Correlation=etapeTraitee.get_child('CorrelationMatrix') + if Correlation !=None : + Correlation.state='arecalculer' + Matrix.state='arecalculer' def recalcule_etat_correlation(self): for etapeTraitee in self.etapes : if etapeTraitee.nom == 'CORRELATION' : - copule=etapeTraitee.get_child('Copula') - if copule !=None : - copule.state='arecalculer' - copule.isvalid() + Matrix=etapeTraitee.get_child('Matrix') + if Matrix !=None : + Matrix.state='arecalculer' + Correlation=Matrix.get_child('CorrelationMatrix') + if Correlation !=None : + Correlation.state='arecalculer' + Correlation.isvalid() + Matrix.isvalid() etapeTraitee.state='arecalculer' if etapeTraitee.state=='arecalculer': etapeTraitee.isvalid() diff --git a/InterfaceQT4/CMakeLists.txt b/InterfaceQT4/CMakeLists.txt index e3ce0580..8c102b66 100644 --- a/InterfaceQT4/CMakeLists.txt +++ b/InterfaceQT4/CMakeLists.txt @@ -20,12 +20,46 @@ # ====================================================================== # Installation de tous les fichiers Python du repertoire et des sous-repertoires (sauf CVS) -install ( DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} - DESTINATION ${CMAKE_INSTALL_PREFIX} - FILES_MATCHING PATTERN *.py - PATTERN CVS EXCLUDE +install ( FILES browser.py compobase.py compobloc.py compocommandecomm.py compocomm.py + compoerror.py compofact.py compoformule.py compojdc.py compomacro.py + compomclist.py componiveau.py componuplet.py compooper.py compoparam.py + compoproc.py composimp.py editor.py eficas_go.py + __init__.py monChoixCata.py monCommandePanel.py + monCommentairePanel.py monFonctionPanel.py monFormulePanel.py + monInactifPanel.py monIncludePanel.py monListeParamPanel.py + monMacroPanel.py monMatricePanel.py monMCFactPanel.py + monMCListAjoutPanel.py monOptionsPdf.py monParamPanel.py monPixmap.py + monPlusieursASSDPanel.py monPlusieursBasePanel.py monPlusieursIntoPanel.py + monPoursuitePanel.py monRacinePanel.py monSelectVal.py + monUniqueASSDPanel.py monUniqueBasePanel.py monUniqueCompPanel.py monUniqueIntoPanel.py + monUniqueSDCOIntoPanel.py monUniqueSDCOPanel.py monVisu.py + politiquesValidation.py qtCommun.py qtEficas.py + qtSaisie.py readercata.py typeNode.py utilIcons.py viewManager.py + DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4 ) +# Installation des fichiers : OpenTURNS +if (WITH_OPENTURNS) + install ( FILES monOptions_OPENTURNS_STUDY.py monOptions_OPENTURNS_WRAPPER.py + DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4 + ) +endif (WITH_OPENTURNS) + +# Installation des fichiers : Aster +if (WITH_ASTER) + install ( FILES gereTraduction.py monOptions_ASTER.py ssIhm.py + DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4 + ) +endif (WITH_ASTER) + +# Installatiion des fichiers : MAP +if (WITH_MAP) + install ( FILES monChoixMap.py + DESTINATION ${CMAKE_INSTALL_PREFIX}/InterfaceQT4 + ) +endif (WITH_MAP) + +#monOptions_CUVE2DG.py ### Local Variables: ### mode: cmake diff --git a/InterfaceQT4/monMatricePanel.py b/InterfaceQT4/monMatricePanel.py index 706a52d0..b604a73e 100644 --- a/InterfaceQT4/monMatricePanel.py +++ b/InterfaceQT4/monMatricePanel.py @@ -58,7 +58,10 @@ class MonMatricePanel(Ui_desMatrice,QDialog): if self.node.item.get_valeur()== None: self.initialSsValeur() else : - self.initialValeur() + try : + self.initialValeur() + except : + self.initialSsValeur() def initVal(self): self.nomVariables={} diff --git a/convert/CMakeLists.txt b/convert/CMakeLists.txt index b7504a84..c72a3c05 100644 --- a/convert/CMakeLists.txt +++ b/convert/CMakeLists.txt @@ -49,6 +49,12 @@ if (WITH_MAP) ) endif (WITH_MAP) +# Installation des fichiers : SEP +if (WITH_SEP) + install ( FILES convert_SEP.py + DESTINATION ${CMAKE_INSTALL_PREFIX}/convert + ) +endif (WITH_SEP) ### Local Variables: ### mode: cmake diff --git a/generator/CMakeLists.txt b/generator/CMakeLists.txt index 7e947fea..ee47eb38 100644 --- a/generator/CMakeLists.txt +++ b/generator/CMakeLists.txt @@ -19,7 +19,7 @@ # # ====================================================================== -install ( FILES __init__.py generator_python.py Formatage.py +install ( FILES __init__.py generator_python.py Formatage.py generator_aplat.py DESTINATION ${CMAKE_INSTALL_PREFIX}/generator ) @@ -33,7 +33,7 @@ endif (WITH_OPENTURNS) # Installation des fichiers : Aster if (WITH_ASTER) - install ( FILES generator_asterv5.py + install ( FILES generator_asterv5.py generator_GroupMA.py generator_vers3DSalome.py DESTINATION ${CMAKE_INSTALL_PREFIX}/generator ) endif (WITH_ASTER) @@ -46,6 +46,13 @@ if (WITH_MAP) endif (WITH_MAP) +# Installation des fichiers : SEP +if (WITH_SEP) + install ( FILES generator_SEP.py tube.py + DESTINATION ${CMAKE_INSTALL_PREFIX}/generator + ) +endif (WITH_SEP) + ### Local Variables: ### mode: cmake -- 2.39.2