X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=Noyau%2FN_MCLIST.py;h=1198e91276df133998270c1315f95aa824f26f30;hb=2c5a8689b9c6cc46804fd268d416d1de2777059e;hp=6c7ab567bcc2e34ca0b9803fe66dd080b28b5b24;hpb=9b4a3f9e1b186a5e94945ba5df2c9689505cb1fc;p=tools%2Feficas.git

diff --git a/Noyau/N_MCLIST.py b/Noyau/N_MCLIST.py
index 6c7ab567..1198e912 100644
--- a/Noyau/N_MCLIST.py
+++ b/Noyau/N_MCLIST.py
@@ -1,24 +1,22 @@
-#@ MODIF N_MCLIST Noyau  DATE 22/02/2005   AUTEUR DURAND C.DURAND 
 # -*- coding: iso-8859-1 -*-
-#            CONFIGURATION MANAGEMENT OF EDF VERSION
-# ======================================================================
-# COPYRIGHT (C) 1991 - 2002  EDF R&D                  WWW.CODE-ASTER.ORG
-# THIS PROGRAM IS FREE SOFTWARE; YOU CAN REDISTRIBUTE IT AND/OR MODIFY
-# IT UNDER THE TERMS OF THE GNU GENERAL PUBLIC LICENSE AS PUBLISHED BY
-# THE FREE SOFTWARE FOUNDATION; EITHER VERSION 2 OF THE LICENSE, OR   
-# (AT YOUR OPTION) ANY LATER VERSION.                                 
+# Copyright (C) 2007-2013   EDF R&D
 #
-# THIS PROGRAM IS DISTRIBUTED IN THE HOPE THAT IT WILL BE USEFUL, BUT 
-# WITHOUT ANY WARRANTY; WITHOUT EVEN THE IMPLIED WARRANTY OF          
-# MERCHANTABILITY OR FITNESS FOR A PARTICULAR PURPOSE. SEE THE GNU    
-# GENERAL PUBLIC LICENSE FOR MORE DETAILS.                            
+# This library is free software; you can redistribute it and/or
+# modify it under the terms of the GNU Lesser General Public
+# License as published by the Free Software Foundation; either
+# version 2.1 of the License.
+#
+# This library is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
+# Lesser General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public
+# License along with this library; if not, write to the Free Software
+# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307 USA
+#
+# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
-# YOU SHOULD HAVE RECEIVED A COPY OF THE GNU GENERAL PUBLIC LICENSE   
-# ALONG WITH THIS PROGRAM; IF NOT, WRITE TO EDF R&D CODE_ASTER,       
-#    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.      
-#                                                                       
-#                                                                       
-# ======================================================================
 
 
 """ 
@@ -121,24 +119,28 @@ class MCList(UserList.UserList):
       """
       l=[]
       for child in self.data:
-        l.extend(child.get_sd_utilisees())
+         l.extend(child.get_sd_utilisees())
       return l
 
    def get_sd_mcs_utilisees(self):
       """ 
           Retourne la ou les SD utilisée par self sous forme d'un dictionnaire :
-          . Si aucune sd n'est utilisée, le dictionnaire est vide.
-          . Sinon, les clés du dictionnaire sont les mots-clés derrière lesquels on
-            trouve des sd ; la valeur est la liste des sd attenante.
-            Exemple : { 'VALE_F': [ <Cata.cata.para_sensi instance at 0x9419854>,
-                                    <Cata.cata.para_sensi instance at 0x941a204> ],
-                        'MODELE': [<Cata.cata.modele instance at 0x941550c>] }
-     """
+            - Si aucune sd n'est utilisée, le dictionnaire est vide.
+            - Sinon, les clés du dictionnaire sont les mots-clés derrière lesquels on
+              trouve des sd ; la valeur est la liste des sd attenante.
+
+              Exemple ::
+              
+                { 'VALE_F': [ <Cata.cata.fonction_sdaster instance at 0x9419854>,
+                              <Cata.cata.fonction_sdaster instance at 0x941a204> ],
+                  'MODELE': [<Cata.cata.modele instance at 0x941550c>] }
+      """
       dico = {}
       for child in self.data:
-        daux = child.get_sd_mcs_utilisees()
-        for cle in daux.keys():
-          dico[cle] = daux[cle]
+         daux = child.get_sd_mcs_utilisees()
+         for cle in daux.keys():
+            dico[cle] = dico.get(cle, [])
+            dico[cle].extend(daux[cle])
       return dico
 
    def get_mcs_with_co(self,co):
@@ -205,3 +207,17 @@ class MCList(UserList.UserList):
          return self.data[0].get_mocle(key)
       else:
          return self.data[key]
+   
+   def List_F(self):
+      """
+         Retourne une liste de dictionnaires (eventuellement singleton) qui peut etre
+         passe directement derriere un mot-cle facteur (pour les macros).
+      """
+      dresu = []
+      for mcf in self:
+         dico = mcf.cree_dict_valeurs(mcf.mc_liste)
+         for i in dico.keys():
+            if dico[i] == None:
+               del dico[i]
+         dresu.append(dico)
+      return dresu