*** empty log message ***

diff --git a/CMakeLists.txt b/CMakeLists.txt
index ecac270691c3c0c6638eaf3d43c9a7301082528b..d857d15d87e0de2f36499c729760287b8a8aa536 100644 (file)
--- 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 ed87c54270bc7e85ebc0c8e6dcb35d148206d268..600e8d0a941c64da084c5503abd112ef5500f192 100644 (file)
--- 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 e3ce05804ea7f01e9618f0b52f362cc152417f14..8c102b66f57bdf51ba7b8da93e742e3dc330c51e 100644 (file)
--- 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 706a52d0b62e7c1398e4df5f4b1efa2c08fb7f6b..b604a73e6fc0fd8fa2894a4161c71ddc018c67bd 100644 (file)
--- 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 b7504a8421b5d6d38a4da30ddbb4a4b65cc763e8..c72a3c05acd87ed69549e40f45e1d18d464dd967 100644 (file)
--- 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 7e947feaafb74b9cbc40f9ce59289d2634fa7e39..ee47eb38b833380850ecbe67681171542c4a6f5f 100644 (file)
--- 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