gestion des listes et label sur 2

[tools/eficas.git] / Ihm / I_MCFACT.py

diff --git a/Ihm/I_MCFACT.py b/Ihm/I_MCFACT.py
index 49a3b44fc5934d1f49e77af2af6433d5b48039bd..afa55037e651edaa578caedd1cad1ad08a21db86 100644 (file)
--- a/Ihm/I_MCFACT.py
+++ b/Ihm/I_MCFACT.py
@@ -1,25 +1,26 @@
 # -*- coding: utf-8 -*-
-#            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.
 #
-# 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.
+# 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
+#
+from Extensions.i18n import tr
 import CONNECTOR
 import I_MCCOMPO
+import Noyau
 
 class MCFACT(I_MCCOMPO.MCCOMPO):
   def isrepetable(self):
@@ -40,13 +41,13 @@ class MCFACT(I_MCCOMPO.MCCOMPO):
   def getlabeltext(self):
     """
        Retourne le label de self suivant qu'il s'agit d'un MCFACT
-       isolé ou d'un MCFACT appartenant à une MCList :
-       utilisée pour l'affichage dans l'arbre
+       isole ou d'un MCFACT appartenant a une MCList :
+       utilisee pour l'affichage dans l'arbre
     """
     objet = self.parent.get_child(self.nom)
-    # objet peut-être self ou une MCList qui contient self ...
+    # objet peut-etre self ou une MCList qui contient self ...
     if objet is None or objet is self:
-      return "Erreur - mclist inexistante: "+self.nom
+     return tr("Erreur - mclist inexistante : %s", self.nom)
 
     try:
       if len(objet) > 1 :
@@ -55,7 +56,7 @@ class MCFACT(I_MCCOMPO.MCCOMPO):
       else:
         return self.nom
     except:
-        return "Erreur - mot clé facteur de nom: "+self.nom
+      return tr("Erreur - mot cle facteur de nom : %s", self.nom)
 
   def init_modif(self):
     """
@@ -80,3 +81,15 @@ class MCFACT(I_MCCOMPO.MCCOMPO):
     if parent:
        parent.fin_modif()
 
+  def normalize(self):
+    """ Retourne le MCFACT normalisé. Pour un MCFACT isolé, l'objet normalisé
+        est une MCLIST de longueur 1 qui contient ce MCFACT
+    """
+    new_obj = self.definition.list_instance()
+    new_obj.init(nom=self.nom,parent=None)
+    new_obj.append(self)
+    return new_obj
+
+  def supprime(self):
+    self.alt_parent=None
+    Noyau.N_MCFACT.MCFACT.supprime(self)