X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;ds=sidebyside;f=Validation%2FV_MCSIMP.py;h=8a5c32e96c6a2da7fe5da9fcf271634aff942534;hb=f1fe188d679966c43c6e965bde6d63bd89451262;hp=28d0d661536767239ec0ce05f871c623aa51c894;hpb=2446a0c7137fa3418368ec577194a6d00e54ed65;p=tools%2Feficas.git diff --git a/Validation/V_MCSIMP.py b/Validation/V_MCSIMP.py index 28d0d661..8a5c32e9 100644 --- a/Validation/V_MCSIMP.py +++ b/Validation/V_MCSIMP.py @@ -1,24 +1,22 @@ -#@ MODIF V_MCSIMP Validation DATE 16/05/2007 AUTEUR COURTOIS M.COURTOIS # -*- 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. -# -# -# ====================================================================== """ Ce module contient la classe mixin MCSIMP qui porte les méthodes @@ -29,7 +27,6 @@ utilisée par héritage multiple pour composer les traitements. """ # Modules Python -import string,types import traceback # Modules EFICAS @@ -37,6 +34,7 @@ from Noyau import N_CR from Noyau.N_Exception import AsException from Noyau.N_VALIDATOR import ValError,TypeProtocol,CardProtocol,IntoProtocol from Noyau.N_VALIDATOR import listProto +from Noyau.strfunc import ufmt class MCSIMP: """ @@ -45,7 +43,7 @@ class MCSIMP: a part quelques changements cosmétiques et des chagements pour la faire fonctionner de facon plus autonome par rapport à l'environnement EFICAS - + A mon avis, il faudrait aller plus loin et réduire les dépendances amont au strict nécessaire. @@ -58,7 +56,7 @@ class MCSIMP: """ CR=N_CR.CR - + def __init__(self): self.state='undetermined' self.typeProto=TypeProtocol("type",typ=self.definition.type) @@ -98,14 +96,14 @@ class MCSIMP: # verification presence if self.isoblig() and v == None : if cr == 'oui' : - self.cr.fatal(string.join(("Mot-clé : ",self.nom," obligatoire non valorisé"))) + self.cr.fatal(_(u"Mot-clé : %s obligatoire non valorisé"), self.nom) valid = 0 lval=listProto.adapt(v) if lval is None: valid=0 if cr == 'oui' : - self.cr.fatal("None n'est pas une valeur autorisée") + self.cr.fatal(_(u"None n'est pas une valeur autorisée")) else: # type,into ... #typeProto=TypeProtocol("type",typ=self.definition.type) @@ -124,18 +122,20 @@ class MCSIMP: typeProto.adapt(val) except ValError,e: valid=0 - self.cr.fatal(str(e)) + self.cr.fatal(*e) try: for val in lval: intoProto.adapt(val) except ValError,e: valid=0 - self.cr.fatal(str(e)) + self.cr.fatal(*e) + #self.cr.fatal(unicode(e)) try: cardProto.adapt(lval) except ValError,e: valid=0 - self.cr.fatal(str(e)) + self.cr.fatal(*e) + #self.cr.fatal(unicode(e)) # # On verifie les validateurs s'il y en a et si necessaire (valid == 1) # @@ -143,16 +143,19 @@ class MCSIMP: try: self.definition.validators.convert(lval) except ValError,e: - self.cr.fatal(string.join(("Mot-clé",self.nom,"invalide :",str(e),"\nCritere de validite:",self.definition.validators.info()))) + self.cr.fatal(_(u"Mot-clé %s invalide : %s\nCritère de validité: %s"), + self.nom, str(e), self.definition.validators.info()) valid=0 else: - #si pas de cr demande, on sort a la toute premiere erreur + #si pas de cr demande, on sort a la toute premiere erreur try: for val in lval: typeProto.adapt(val) intoProto.adapt(val) cardProto.adapt(lval) if self.definition.validators: + if hasattr(self.definition.validators,'set_MCSimp'): + self.definition.validators.set_MCSimp(self) self.definition.validators.convert(lval) except ValError,e: valid=0 @@ -167,7 +170,7 @@ class MCSIMP: def init_modif_up(self): """ - Propage l'état modifié au parent s'il existe et n'est l'objet + Propage l'état modifié au parent s'il existe et n'est l'objet lui-meme """ if self.parent and self.parent != self : @@ -176,14 +179,14 @@ class MCSIMP: def report(self): """ génère le rapport de validation de self """ self.cr=self.CR() - self.cr.debut = "Mot-clé simple : "+self.nom - self.cr.fin = "Fin Mot-clé simple : "+self.nom + self.cr.debut = u"Mot-clé simple : "+self.nom + self.cr.fin = u"Fin Mot-clé simple : "+self.nom self.state = 'modified' try: self.isvalid(cr='oui') except AsException,e: if CONTEXT.debug : traceback.print_exc() - self.cr.fatal(string.join(("Mot-clé simple : ",self.nom,str(e)))) + self.cr.fatal(_(u"Mot-clé simple : %s %s"), self.nom, e) return self.cr