pour generation des blocs

diff --git a/Ihm/I_MACRO_ETAPE.py b/Ihm/I_MACRO_ETAPE.py
index 20a0927a2020f444c195ba194a3cd7663ef2439e..a5a4e8b48dae772a3c59d0faf13456ea5ce6cd4e 100644 (file)
--- a/Ihm/I_MACRO_ETAPE.py
+++ b/Ihm/I_MACRO_ETAPE.py
@@ -226,7 +226,6 @@ class MACRO_ETAPE(I_ETAPE.ETAPE):
             if callable(v):continue
             self.g_context[k]=param2.Variable(k,v)
 
-    print ('kkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkkmmmmmmmmmmmmmmmmmmmmmm')
     print (j)
     print (dir(j))
     print (j.current_context)

diff --git a/Ihm/I_MCCOMPO.py b/Ihm/I_MCCOMPO.py
index 266ae58affdb3b8ff0fb2706f1a686a00e9e08da..a335078a8b2f792f0b308b81dbc511bbd1a01a39 100644 (file)
--- a/Ihm/I_MCCOMPO.py
+++ b/Ihm/I_MCCOMPO.py
@@ -219,7 +219,10 @@ class MCCOMPO(I_OBJECT.OBJECT):
 
     self.initModif()
     objet.delObjPyxb()
-    objet.deleteRef()
+# PNPNPN a corriger
+    try :
+      objet.deleteRef()
+    except : pass
     self.mcListe.remove(objet)
     CONNECTOR.Emit(self,"supp",objet)
     objet.deleteMcGlobal()

diff --git a/Ihm/I_MCSIMP.py b/Ihm/I_MCSIMP.py
index 0f7943f0108530b3c35a4b2ba5c9872071ab0e4f..5d0c0ccc2b1ea806c4132f6458a56a02b6b76639 100644 (file)
--- a/Ihm/I_MCSIMP.py
+++ b/Ihm/I_MCSIMP.py
@@ -604,7 +604,11 @@ class MCSIMP(I_OBJECT.OBJECT):
          if etape :
             del etape.mc_globaux[self.nom]
       elif self.definition.position == 'global_jdc' :
-         del self.jdc.mc_globaux[self.nom]
+# PNPNPN a debuger
+         print (self.nom)
+         try :
+           del self.jdc.mc_globaux[self.nom]
+         except : pass
 
   def updateMcGlobal(self):
      """

diff --git a/Noyau/N_BLOC.py b/Noyau/N_BLOC.py
index 5d594d658992bb7bc6d6b66013b46de3d39b288e..73d9835fb0b08f9cfcb571fc67c5599bfe01fecf 100644 (file)
--- a/Noyau/N_BLOC.py
+++ b/Noyau/N_BLOC.py
@@ -152,14 +152,6 @@ class BLOC(N_ENTITE.ENTITE):
             return 0
 
 
-    def construitArbrePossibles(self):
-      self.arbrePossibles=[[],]
-      for child in self.mcListe :
-         if child.label != 'BLOC' :
-            self.arbrePossibles = deepcopy(self.adjoint(self.arbrePossibles, child.arbrePossibles))
-         else :
-            self.arbrePossibles = deepcopy(self.fusionne(self.arbrePossibles, child.arbrePossibles))
-      self.arbrePossibles.append([])
 
     
     def longueurDsArbre(self):

diff --git a/Noyau/N_ENTITE.py b/Noyau/N_ENTITE.py
index 22058f5daaf3c4564c895244bc922a4aa33e6351..670ec41481e2498ee81fe1d321bea9ba3ac6f832 100644 (file)
--- a/Noyau/N_ENTITE.py
+++ b/Noyau/N_ENTITE.py
@@ -70,8 +70,6 @@ class ENTITE(object):
         #self.doitSenregistrerComme = None
         self.txtNomComplet=''
         self.redefinit=False
-        #self.construitArbrePossible()
-        #print ('____________________________ init _________________', self.nom, self.arbrePossible)
 
     def affecter_parente(self):
         """
@@ -312,26 +310,5 @@ class ENTITE(object):
        self.redefinit=True
        # PNPN il faut remonter a l etape
    
-    def adjoint(self, liste1, liste2):
-    # utilise pour l arbrePossibles
-       print ('adjoint', liste1, liste2)
-       l=[]
-       for elt1 in liste1:
-           for elt2 in liste2:
-               newListe=deepcopy(elt1)
-               if  elt2 != []: newListe.append(elt2)
-               l.append(newListe)
-       return l
-
-    def fusionne(self, liste1, liste2):
-    # utilise pour l arbrePossibles
-       l=[]
-       for elt1 in liste1 :
-           for eltListe in liste2:
-               newListe=deepcopy(elt1)
-               for elt in eltListe :
-                   newListe.append(elt)
-               l.append(newListe)
-       return l
 
    

diff --git a/Noyau/N_ETAPE.py b/Noyau/N_ETAPE.py
index 06d2f9933974f63e9d21a9a0bcc1189b7215cd23..3e2da2dbff69536c048545ece688298fd68a975f 100644 (file)
--- a/Noyau/N_ETAPE.py
+++ b/Noyau/N_ETAPE.py
@@ -464,11 +464,3 @@ Causes possibles :
         # on passe la main au parent
         return self.parent.getConcept(nomsd)
  
-    def construitArbrePossibles(self):
-       self.arbrePossibles=[[],]
-       for child in self.mcListe :
-          if child.label != 'BLOC' :
-              self.arbrePossibles = deepcopy(self.adjoint(self.arbrePossibles, child.arbrePossibles))
-          else :
-              self.arbrePossibles = deepcopy(self.fusionne(self.arbrePossibles, child.arbrePossibles))
-

diff --git a/Noyau/N_FACT.py b/Noyau/N_FACT.py
index 44948b25714e3113bff0191f1fc93c79cd5f5728..907533908ab2e73c473dedd2a573c487cd927a4c 100644 (file)
--- a/Noyau/N_FACT.py
+++ b/Noyau/N_FACT.py
@@ -173,9 +173,4 @@ class FACT(N_ENTITE.ENTITE):
         self.checkValidators()
         self.verifCataRegles()
 
-    def construitArbrePossibles(self):
-        if self.statut   ==  'f' :
-           self.arbrePossibles = (self.nom,[])
-        else :
-           self.arbrePossibles = (self.nom,)
 

diff --git a/Noyau/N_SIMP.py b/Noyau/N_SIMP.py
index 777ab3b7225b499f4ff3a8018e36beb6242ecc9c..40b8452de800b27d5f5bef6fbcdbb152ff086dfb 100644 (file)
--- a/Noyau/N_SIMP.py
+++ b/Noyau/N_SIMP.py
@@ -138,10 +138,6 @@ class SIMP(N_ENTITE.ENTITE):
         self.checkPosition()
         self.checkValidators()
    
-    def construitArbrePossible(self):
-        if self.statut   ==  'f' : self.arbrePossibles = (self.nom,[])
-        else : self.arbrePossibles = (self.nom,)
-        return
 
     def __call__(self, val, nom, parent=None, objPyxbDeConstruction = None):
         """