cps

diff --git a/InterfaceQT4/monWidgetPlusieursBase.py b/InterfaceQT4/monWidgetPlusieursBase.py
index 7c63a7960a69274ca710ffa3fee981b7253217fb..50a2413b89517894cb064f205541a591782d9c00 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursBase.py
+++ b/InterfaceQT4/monWidgetPlusieursBase.py
@@ -49,7 +49,7 @@ nbMinimumDeQLineEdit=7
 class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie):
 
   def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
-        print ('MonWidgetPlusieursBase', nom)
+        #print ('MonWidgetPlusieursBase', nom)
         self.inFocusOutEvent      = False
         self.changeUnLineEdit     = False
         self.nomLine              = "lineEditVal"
@@ -132,11 +132,11 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie)
        
 
   def ajoutLineEdit(self,valeur=None,):
-      print ('ajoutLineEdit, monWidgetPlusieursBase', self.indexDernierLabel)
+      #print ('ajoutLineEdit, monWidgetPlusieursBase', self.indexDernierLabel)
       self.indexDernierLabel=self.indexDernierLabel+1
       nomLineEdit="lineEditVal"+str(self.indexDernierLabel)
       if hasattr(self,nomLineEdit) : 
-         print ('ajoutLineEdit, monWidgetPlusieursBase', self.indexDernierLabel)
+         #print ('ajoutLineEdit, monWidgetPlusieursBase', self.indexDernierLabel)
          self.indexDernierLabel=self.indexDernierLabel-1
          return
       nouveauLE = LECustom(self.scrollArea,self,self.indexDernierLabel)
@@ -159,7 +159,7 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie)
       # deux lignes pour que le ensureVisible fonctionne
       self.estVisible=nouveauLE
       if self.inInit==False :QTimer.singleShot(1, self.rendVisibleLigne)
-      print ('ajoutLineEdit, monWidgetPlusieursBase', self.indexDernierLabel)
+      #print ('ajoutLineEdit, monWidgetPlusieursBase', self.indexDernierLabel)
 
   def etablitOrdre(self):
       i=0
@@ -243,7 +243,7 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie)
         
 
   def changeValeur(self,changeDePlace=True,oblige=False,numero=None):
-      print ('monWidgetPlusieursBase changeValeur')
+      #print ('monWidgetPlusieursBase changeValeur')
       self.changeUnLineEdit = False
       donneFocus=None
       derniereValeur=None
@@ -285,7 +285,7 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie)
       if len(self.listeValeursCourantes) < min and oblige==True: return
       if len(self.listeValeursCourantes) > max : return
       self.node.item.setValeur(self.listeValeursCourantes)
-      print (self.listeValeursCourantes)
+      #print (self.listeValeursCourantes)
       if len(self.listeValeursCourantes) == self.monSimpDef.max  :
         self.editor.afficheInfos(tr('nb max de valeurs atteint'))
       self.setValide()

diff --git a/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py b/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py
index 28357277e710d3b9a5a1fb4d206f646e5719155d..06bc57531c2c7a99cd6318ffa182edee43413ee2 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py
+++ b/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py
@@ -219,7 +219,7 @@ class MonWidgetPlusieursIntoOrdonne (Ui_WidgetPlusieursIntoOrdonne, Feuille,Gere
       setattr(self,nomLE,nouveauLE)
       
   def ajoutLineEdit(self):
-      print ('ajoutLineEdit')
+      #print ('ajoutLineEdit')
       self.indexDernierLabel=self.indexDernierLabel+1
       self.ajoutLEResultat (self.indexDernierLabel)
 

diff --git a/Noyau/N_ASSD.py b/Noyau/N_ASSD.py
index fa1adfbcf973df34065333b08cab7e99b30a2513..4ca9638ff857939dea8626bf8a8c78bdc3d7a5e4 100644 (file)
--- a/Noyau/N_ASSD.py
+++ b/Noyau/N_ASSD.py
@@ -131,7 +131,8 @@ class ASSD(object):
                 self.nom = self.parent.getName(self) or self.id
             except:
                 self.nom = ""
-        if self.nom.find('sansnom') != -1 or self.nom == '':
+
+        if self.nom=='sansnom' or self.nom == '':
             self.nom = self.id
         return self.nom
 

diff --git a/Noyau/N_JDC.py b/Noyau/N_JDC.py
index ac42a6805120a2ad67db9ed14a2eb4d74b41aaec..74ef1e47a769f6cc9b4d28f2606a4039a52045a4 100644 (file)
--- a/Noyau/N_JDC.py
+++ b/Noyau/N_JDC.py
@@ -192,8 +192,7 @@ Causes possibles :
         # aux commandes qui sont dans la chaine
         import linecache
         linecache.cache[self.nom] = 0, 0, self.procedure.split('\n'), self.nom
-        #try:
-        if 1 :
+        try:
             exec(self.exec_init, self.g_context)
             for obj_cata in (self.cata,):
                 if type(obj_cata) == types.ModuleType:
@@ -231,9 +230,6 @@ Causes possibles :
 
             CONTEXT.unsetCurrentStep()
 
-        else : pass
-        try :
-           print ('PNPN')
         except InterruptParsingError:
             # interrupt the command file parsing used by FIN to ignore the end
             # of the file
@@ -657,7 +653,8 @@ Causes possibles :
         #for cat in self.cata:
         cat=self.cata
         self._reserved_kw.update(
-                [kw for kw in dir(cat) if len(kw) <= 8 and kw == kw.upper()])
+                #PN 14  2020 [kw for kw in dir(cat) if len(kw) <= 8 and kw == kw.upper()])
+                [kw for kw in dir(cat) ])
         self._reserved_kw.difference_update(
             ['OPER', 'MACRO', 'BLOC', 'SIMP', 'FACT', 'FORM',
              'GEOM', 'MCSIMP', 'MCFACT'])

diff --git a/Vimmp/cata_cps.py b/Vimmp/cata_cps.py
index fb7e69be7ff6281add2e928cce551680330339d6..1c6ae4248289eb39a38c9c524875d5e91ac32b5b 100644 (file)
--- a/Vimmp/cata_cps.py
+++ b/Vimmp/cata_cps.py
@@ -29,9 +29,7 @@ Particle=PROC(nom='Particle',
      ),
      b_Molecule = BLOC( condition='ParticleNature == "Molecule"',
        MoleculeName    = SIMP( statut='o', typ=(userParticle,'createObject'),),
-       ChemicalSpecies = SIMP( statut='o', typ=userAtom, max ='**'),
-       Proportion      = SIMP( statut='o', typ='R', max ='**'),
-       ChemicalSpecies2 = FACT ( max='**', statut='o',
+       ChemicalSpecies = FACT ( max='**', statut='o',
           ChemicalSpeciesName = SIMP( statut='o', typ=userAtom),
           Proportion        = SIMP( statut='o', typ='R', val_max =1),
        ),