ajout validation mt

diff --git a/InterfaceQT4/gereListe.py b/InterfaceQT4/gereListe.py
index 72b4adea594c0e319b9c16d56eb5080e90918850..755b00e711ad8ace046459b50372cbdff0bc46dc 100644 (file)
--- a/InterfaceQT4/gereListe.py
+++ b/InterfaceQT4/gereListe.py
@@ -53,9 +53,13 @@ class LECustom(QLineEdit):
         self.num=i
         self.dansUnTuple=False
         self.numDsLaListe=-1
+        self.parentTuple=None
+        self.valeur=None
 
  def focusInEvent(self,event):
-     #print "dans focusInEvent de LECustom"
+     #print ("dans focusInEvent de LECustom")
+     self.parentQt.aEuLeFocus=True
+     self.aEuLeFocus=True
      self.parentQt.LineEditEnCours=self
      self.parentQt.numLineEditEnCours=self.num
      self.parentQt.textSelected=self.text()
@@ -63,32 +67,43 @@ class LECustom(QLineEdit):
      QLineEdit.focusInEvent(self,event)
 
  def focusOutEvent(self,event):
+     #print (self.aEuLeFocus)
      self.setStyleSheet("border: 0px")
      if self.dansUnTuple    : self.setStyleSheet("background:rgb(235,235,235); border: 0px;")
      elif self.num % 2 == 1 : self.setStyleSheet("background:rgb(210,210,210)")
      else                   : self.setStyleSheet("background:rgb(235,235,235)")
+     if self.aEuLeFocus:
+       self.aEuLeFocus=False
+       self.litValeur()
+       if self.dansUnTuple : self.parentTuple.getValeur()
+     QLineEdit.focusOutEvent(self,event)
        
     
-     
-     from InterfaceQT4.monWidgetPlusieursBase import MonWidgetPlusieursBase
+ def litValeur(self):
+     #print ("dans litValeur de LECustom")
+     self.aEuLeFocus=False
+     val=str(self.text())
+     if str(val)=="" or val==None :
+        self.valeur=None
+        return
      try :
-       #if isinstance (self.parentQt, MonWidgetPlusieursBase) and not self.parentQt.inFocusOutEvent : 
-       #  self.parentQt.inFocusOutEvent=True
-       #  self.parentQt.changeValeur(changeDePlace=True,oblige=False)
-       #  self.parentQt.inFocusOutEvent=False
-
-       #if isinstance(self,LECustomTuple)  and  not self.tupleCustomParent.inFocusOutEvent:
-       #  self.tupleCustomParent.inFocusOutEvent=True
-       #  self.tupleCustomParent.valueChange()
-       #  self.tupleCustomParent.inFocusOutEvent=False
-       QLineEdit.focusOutEvent(self,event)
-     except : pass
-
+       valeur=eval(val,{})
+     except :
+       try :
+          d=self.parentQt.parentQt.objSimp.jdc.getContexteAvant(self.parentQt.objSimp. etape)
+          valeur=eval(val,d)
+       except :
+          valeur=val
+     self.valeur=valeur
+     #print ('self.valeur', self.valeur)
+     
+     
  def clean(self):
      self.setText("")
 
  def getValeur(self):
-     return self.text()
+     #return self.text()
+     return self.valeur
 
  def setValeur(self,valeur):
      self.setText(valeur)
@@ -140,6 +155,8 @@ class GereListe(object):
           self.PBAlpha.clicked.connect(self.alphaPushed)
           self.PBFind.clicked.connect(self.findPushed)
           self.LEFiltre.returnPressed.connect(self.LEFiltreReturnPressed)
+       if hasattr(self, 'PBValideFeuille'):
+          self.PBValideFeuille.clicked.connect(self.changeValeur)
 
    def filtreListe(self):
        l=[]

diff --git a/InterfaceQT4/monWidgetPlusieursPlie.py b/InterfaceQT4/monWidgetPlusieursPlie.py
index 47231a08be34cbecda3315621dd5da0696d82f4b..389e5111afdbf2d814b7909d2b41dae8ac72469e 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursPlie.py
+++ b/InterfaceQT4/monWidgetPlusieursPlie.py
@@ -78,7 +78,7 @@ class MonWidgetPlusieursPlie (Ui_WidgetPlusieursPlie,Feuille):
       #print (valeurTexte[-1])
       if valeurTexte[0] == '[' or valeurTexte[0] == '('   : valeurTexte = valeurTexte[1:]
       if valeurTexte[-1] == ']' or valeurTexte[-1] == ')' : valeurTexte = valeurTexte[:-1]
-      print (valeurTexte)
+      #print (valeurTexte)
       listeValeursBrutes=valeurTexte.split(',')
       if listeValeursBrutes == [] or listeValeursBrutes == None : 
          self.lineEditVal.setText(str(self.listeValeursCourantes))

diff --git a/InterfaceQT4/monWidgetPlusieursTuple.py b/InterfaceQT4/monWidgetPlusieursTuple.py
index 39061010c4864a0ac8c0662c36b56d3e0641d240..a4022dc6d087377863d8c8571cad64b8d83a4a6a 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursTuple.py
+++ b/InterfaceQT4/monWidgetPlusieursTuple.py
@@ -62,7 +62,7 @@ class TupleCustom(object) :
       self.tailleTuple=tailleTuple
       self.parent=parent
       self.parentQt=parentQt
-      self.valeur=None
+      self.valeur=[]
       self.index=index
       self.inFocusOutEvent=False
 
@@ -75,6 +75,7 @@ class TupleCustom(object) :
          courant.returnPressed.connect(self.valueChange)
          courant.numDsLaListe = i+1
          courant.tupleCustomParent=self
+         courant.parentTuple = self
 
 
   def valueChange(self):
@@ -135,6 +136,14 @@ class TupleCustom(object) :
 
   def getValeur(self):
   #----------------------
+      self.valeur=[]
+      vide=True
+      for i in range(self.tailleTuple):
+         nomLE="lineEditVal_"+str(i+1)
+         courant=getattr(self,nomLE)
+         self.valeur.append(courant.valeur)
+         if courant.valeur!= None : vide = False 
+      if vide : self.valeur=[]
       return self.valeur
 
   def text(self):
@@ -341,11 +350,13 @@ class MonWidgetPlusieursTuple(Feuille,GereListe):
       aLeFocus=self.focusWidget()
       listeComplete=[]
       libre=False
+      #print (self.indexDernierLabel)
       for i in range(self.indexDernierLabel) :
           nom=self.nomLine+str(i+1)
           courant=getattr(self,nom)
           valeurTuple=courant.valeur
-          if valeurTuple == None or valeurTuple== "": 
+          #print (courant, i, valeurTuple)
+          if valeurTuple == None or valeurTuple== "" or valeurTuple==[]: 
              libre=True
              continue
           validite,comm,comm2,listeRetour= self.politique.ajoutTuple(valeurTuple,listeComplete)
@@ -354,6 +365,7 @@ class MonWidgetPlusieursTuple(Feuille,GereListe):
              self.editor.afficheInfos(comm+" "+str(self.objSimp.definition.validators.typeDesTuples),Qt.red)
              return
           listeComplete.append(tuple(courant.valeur))
+      #print ('listeComplete', listeComplete)
       if listeComplete == [] : listeComplete=None
       self.node.item.setValeur(listeComplete)