sauve0206

[tools/eficas.git] / Ihm / I_JDC.py

diff --git a/Ihm/I_JDC.py b/Ihm/I_JDC.py
index b387b91ac1ff2387ba8f795935b3c32fb7dd5ca6..c2ee3459f62d511c1bffcb70e45c32e6f97bfdf2 100644 (file)
--- a/Ihm/I_JDC.py
+++ b/Ihm/I_JDC.py
@@ -71,9 +71,9 @@ class JDC(I_OBJECT.OBJECT):
         if type(v) != types.InstanceType and not isinstance(v,object): continue
         # On considere que seul assd indique un type quelconque pas CO
         elif self.assd in types_permis :
-           l.append(k)
+           if v.etape.sdnom != "sansnom" : l.append(k)
         elif self.est_permis(v,types_permis):
-           l.append(k)
+           if v.etape.sdnom != "sansnom" : l.append(k)
       l.sort()
       return l
 
@@ -93,38 +93,41 @@ class JDC(I_OBJECT.OBJECT):
       etapeStop=etape
       l=[]
       for etapeTraitee in self.etapes :
-          if etapeTraitee==etapeStop:
-             break
-          if etapeTraitee.nom == 'DISTRIBUTION' :
-             l.append(etapeTraitee.sd.nom)
+          if etapeTraitee==etapeStop: break
+          if etapeTraitee.nom == 'DISTRIBUTION' and etapeTraitee.sd !=None : l.append(etapeTraitee.sd.nom)
       return l
 
 
-   def set_Copules_recalcule_etat(self):
-      for etapeTraitee in self.etapes :
-          if etapeTraitee.nom == 'CORRELATION' :
-             Matrix=etapeTraitee.get_child('Matrix')
-             if Matrix !=None :
-                Correlation=etapeTraitee.get_child('CorrelationMatrix')
-                if Correlation !=None :
-                   Correlation.state='arecalculer'
-                Matrix.state='arecalculer'
+   #def set_Copules_recalcule_etat(self):
+   #   for etapeTraitee in self.etapes :
+   #       if etapeTraitee.nom == 'CORRELATION' :
+             #Matrix=etapeTraitee.get_child('Matrix')
+             #if Matrix !=None :
+   #             Correlation=etapeTraitee.get_child('CorrelationMatrix')
+   #             if Correlation !=None : Correlation.state='arecalculer'
+             #   Matrix.state='arecalculer'
      
+   #def recalcule_etat_correlation(self):
+   #   for etapeTraitee in self.etapes :
+   #       if etapeTraitee.nom == 'CORRELATION' :
+             #Matrix=etapeTraitee.get_child('Matrix')
+             #if Matrix !=None :
+   #             Matrix.state='arecalculer'
+   #             Correlation=Matrix.get_child('CorrelationMatrix')
+   #             if Correlation !=None : Correlation.state='arecalculer'
+   #                Correlation.isvalid()
+   #             Matrix.isvalid()
+   #             etapeTraitee.state='arecalculer'
+   #          if etapeTraitee.state=='arecalculer': etapeTraitee.isvalid()
+                
    def recalcule_etat_correlation(self):
       for etapeTraitee in self.etapes :
           if etapeTraitee.nom == 'CORRELATION' :
-             Matrix=etapeTraitee.get_child('Matrix')
-             if Matrix !=None :
-                Matrix.state='arecalculer'
-                Correlation=Matrix.get_child('CorrelationMatrix')
-                if Correlation !=None :
-                   Correlation.state='arecalculer'
-                   Correlation.isvalid()
-                Matrix.isvalid()
-                etapeTraitee.state='arecalculer'
-             if etapeTraitee.state=='arecalculer':
-                etapeTraitee.isvalid()
-                
+             Correlation=etapeTraitee.get_child('CorrelationMatrix')
+             if Correlation !=None : 
+                  Correlation.state='arecalculer'
+                  Correlation.isvalid()
+             etapeTraitee.isvalid()
 
    def recalcule_validite_apres_changement_global_jdc(self):
         #print "je passe dans recalcule_validite_apres_changement_global_jdc"