From: pascale.noyret <pascale.noyret@edf.fr>
Date: Wed, 23 Sep 2020 16:10:42 +0000 (+0200)
Subject: oubli
X-Git-Tag: MDM_V0~18
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=2319eebd1945a5078d2b6657b4365edb2a5d3c2b;p=tools%2Feficas.git

oubli
---

diff --git a/Noyau/N_ASSD.py b/Noyau/N_ASSD.py
index 4ca9638f..801df350 100644
--- a/Noyau/N_ASSD.py
+++ b/Noyau/N_ASSD.py
@@ -33,7 +33,7 @@ class ASSD(object):
     """
        Classe de base pour definir des types de structures de donnees ASTER
        equivalent d un concept ASTER
-       Doit_on garder tout ce qui concerne jeveux ?
+       Doit_on garder tout ce qui concerne jeveux ? les concepts ?
     """
     idracine = "SD"
 
@@ -105,6 +105,11 @@ class ASSD(object):
     def setName(self, nom):
         """Positionne le nom de self 
         """
+        print ('uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu')
+        print ('uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu')
+        print ('uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu')
+        print ('uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu')
+        print ('uuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuuu')
         self.nom = nom
 
     def isTypCO(self):
diff --git a/Noyau/N_ENTITE.py b/Noyau/N_ENTITE.py
index b1ca94f5..0cd64d55 100644
--- a/Noyau/N_ENTITE.py
+++ b/Noyau/N_ENTITE.py
@@ -70,6 +70,7 @@ class ENTITE(object):
         #self.doitSenregistrerComme = None
         self.txtNomComplet=''
         self.redefinit=False
+        self.dejaPrepareDump=False
 
     def affecter_parente(self):
         """
diff --git a/Noyau/N_MCCOMPO.py b/Noyau/N_MCCOMPO.py
index fc4d3914..15f27b9a 100644
--- a/Noyau/N_MCCOMPO.py
+++ b/Noyau/N_MCCOMPO.py
@@ -45,7 +45,6 @@ class MCCOMPO(N_OBJECT.OBJECT):
         #import traceback
         #traceback.print_stack()
         #print(("MCCOMPO.buildMc _____________________________________", self.nom))
-        #print (self.dicoPyxbDeConstruction)
         if CONTEXT.debug:
             print(("MCCOMPO.buildMc ", self.nom))
         # Dans la phase de reconstruction args peut contenir des mots-clés
@@ -54,6 +53,7 @@ class MCCOMPO(N_OBJECT.OBJECT):
         # mais qui sont malgré tout des descendants de l'objet courant
         # (petits-fils, ...)
         args = self.valeur
+        #print ('MCCOMPO___________________', self.valeur)
         if args == None: args = {}
         mcListe = []
         
@@ -83,6 +83,7 @@ class MCCOMPO(N_OBJECT.OBJECT):
                    del self.dicoPyxbDeConstruction[k]
                 else :
                    objPyxbDeConstruction=None
+                #print (args.get(k, None))
                 objet = v(val=args.get(k, None), nom=k, parent=self,objPyxbDeConstruction=objPyxbDeConstruction)
                 mcListe.append(objet)
                 # Si l'objet a une position globale on l'ajoute aux listes
diff --git a/Noyau/N_MCFACT.py b/Noyau/N_MCFACT.py
index 38234f62..3974cdb6 100644
--- a/Noyau/N_MCFACT.py
+++ b/Noyau/N_MCFACT.py
@@ -42,10 +42,9 @@ class MCFACT(N_MCCOMPO.MCCOMPO):
             - nom
             - parent
         """
-        #print ('MCFACT', self, val, definition, nom, parent, objPyxbDeConstruction)
-        import traceback
+        print ('MCFACT', self, val, definition, nom, parent, dicoPyxbDeConstruction)
+        #import traceback
         #traceback.print_stack()
-        #if nom == 'experience' : print ('MCFACT', self, parent, dicoPyxbDeConstruction); exit()
         self.dicoPyxbDeConstruction=dicoPyxbDeConstruction
         if self.dicoPyxbDeConstruction :
            self.objPyxbDeConstruction=self.dicoPyxbDeConstruction['objEnPyxb']
diff --git a/Noyau/N_MCSIMP.py b/Noyau/N_MCSIMP.py
index 4d30e125..92d007eb 100644
--- a/Noyau/N_MCSIMP.py
+++ b/Noyau/N_MCSIMP.py
@@ -54,7 +54,6 @@ class MCSIMP(N_OBJECT.OBJECT):
             - valeur : valeur du mot-clé simple en tenant compte de la valeur par défaut
 
         """
-        #print ("MCSIMP, ------------------------")
         #print (self, val, definition, nom, parent)
         self.definition = definition
         self.nom = nom
@@ -98,7 +97,7 @@ class MCSIMP(N_OBJECT.OBJECT):
             de la valeur donnée. Defaut si val == None
         """
         if (val is None and hasattr(self.definition, 'defaut')): val = self.definition.defaut
-        if val in list(self.jdc.sdsDict.keys()): return self.jdc.sdsDict[val]
+        if self.jdc != None and val in list(self.jdc.sdsDict.keys()): return self.jdc.sdsDict[val]
          # dans le cas de lecture de .comm, il est possible que l objet est deja ete cree
          # peut-etre devrait on aussi verifier que val est de type string ?
         if self.definition.creeDesObjets : 
diff --git a/Noyau/N_OPER.py b/Noyau/N_OPER.py
index 22263f3c..3b18d5a0 100644
--- a/Noyau/N_OPER.py
+++ b/Noyau/N_OPER.py
@@ -120,6 +120,7 @@ class OPER(N_ENTITE.ENTITE):
         self.affecter_parente()
         self.checkDefinition(self.nom)
         self.txtNomComplet=""
+        self.dejaPrepareDump=False
 
     def __call__(self, reuse=None, **args):
         """
diff --git a/Noyau/N_PROC.py b/Noyau/N_PROC.py
index 97c120df..fcc0bd30 100644
--- a/Noyau/N_PROC.py
+++ b/Noyau/N_PROC.py
@@ -115,6 +115,7 @@ class PROC(N_ENTITE.ENTITE):
         self.UIinfo = UIinfo
         self.affecter_parente()
         self.checkDefinition(self.nom)
+        self.dejaPrepareDump=False
 
     def __call__(self, **args):
         """