pour prise en compte du statut

diff --git a/Ihm/I_MCLIST.py b/Ihm/I_MCLIST.py
index ca0253f6b8653f0ace2a781c75f7308c221e0e7c..135aa69864a733de5629e346702d348470d0d9a3 100644 (file)
--- a/Ihm/I_MCLIST.py
+++ b/Ihm/I_MCLIST.py
@@ -73,8 +73,12 @@ class MCList:
     def getDicoForFancy(self):
         #print ('MCList getDicoObjetsCompletsPourTree pour ', self)
         listeDict=[]
+        facultatif=1
         for i in self.data:
-            listeDict.append(i.getDicoForFancy())
+            dico = i.getDicoForFancy()
+            if facultatif > i.definition.min : dico['statut']='f'
+            facultatif+=1
+            listeDict.append(dico)
         return listeDict
 
     def isOblig(self):

diff --git a/Ihm/I_MCSIMP.py b/Ihm/I_MCSIMP.py
index eb7c357f52c9d28318fc204f18f92403240775f9..449906491108fb799b093a278e8737f746565aef 100644 (file)
--- a/Ihm/I_MCSIMP.py
+++ b/Ihm/I_MCSIMP.py
@@ -95,6 +95,7 @@ class MCSIMP(I_OBJECT.OBJECT):
         monDico['max']=self.definition.max
         monDico['min']=self.definition.min
         monDico['into']=self.definition.into
+        monDico['statut']=self.definition.statut
 
         
         return monDico

diff --git a/Noyau/N_FACT.py b/Noyau/N_FACT.py
index c5737a07940852de3c49eb46c083eb866c74d830..367a3727e8478f5874362c40f0d7e1a076540658 100644 (file)
--- a/Noyau/N_FACT.py
+++ b/Noyau/N_FACT.py
@@ -84,6 +84,7 @@ class FACT(N_ENTITE.ENTITE):
         self.max = max
         if self.max == "**" : self.max=float('inf')
         if self.min == "**" : self.min=float('-inf')
+        if self.statut =='o' and self.min==0 : self.min=1
         self.entites = args
         self.position = None
         self.affecter_parente()