From 12f114e1d8b960e1d95d836663bfa1fa96d5f9bf Mon Sep 17 00:00:00 2001 From: "pascale.noyret" Date: Tue, 27 Apr 2021 08:49:30 +0200 Subject: [PATCH] bug --- Ihm/I_MCSIMP.py | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/Ihm/I_MCSIMP.py b/Ihm/I_MCSIMP.py index a380c1aa..d1646b4e 100644 --- a/Ihm/I_MCSIMP.py +++ b/Ihm/I_MCSIMP.py @@ -117,11 +117,11 @@ class MCSIMP(I_OBJECT.OBJECT): if isinstance(val,tuple): texteVal='(' for i in val : - if isinstance(i, bytes) : texteVal = texteVal +"'"+str(i)+"'," + if isinstance(i, bytes) or isinstance(i,str) : texteVal = texteVal +"'"+str(i)+"'," else : texteVal = texteVal + str(i)+',' texteVal=texteVal[:-1]+')' else : - if isinstance(val,bytes): texteVal="'"+str(val)+"'" + if isinstance(val,bytes) or isinstance(i,str): texteVal="'"+str(val)+"'" else :texteVal=str(val) txt = txt + sep+ texteVal @@ -263,6 +263,20 @@ class MCSIMP(I_OBJECT.OBJECT): return 1 return 0 + def combienEltDsTuple(self): + for ss_type in self.definition.type: + if hasattr(ss_type,'ntuple'): + return ss_type.ntuple + return O + + def waitMatrice(self): + if hasattr(self, 'isAMatrice') : return self.isAMatrice + for typ in self.definition.type: + try : + if hasattr(typ, 'typElt') : self.isAMatrice=1; return 1 + except : pass + self.isAMatrice=0 + return 0 def getListeValeurs(self): """ @@ -342,6 +356,7 @@ class MCSIMP(I_OBJECT.OBJECT): if self.definition.position == 'global' : self.etape.deepUpdateConditionBloc() elif self.definition.position == 'reCalculeEtape' : + print ('je passe par la pour ', self.nom) self.etape.deepUpdateConditionBloc() self.etape.demandeRedessine() elif self.definition.position == 'global_jdc' : -- 2.39.2