X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2FmonWidgetSimpBase.py;h=a03db34afa14c7fdd7fb1f8bbf33894d05ae4671;hb=e570dff249a11579eb7d33de376ed71be16d7261;hp=c8202eb5bdb0ca24c4c98591fb18f48c1837ca01;hpb=16d5922e798b1254eb558678612711d72ed38b32;p=tools%2Feficas.git

diff --git a/InterfaceQT4/monWidgetSimpBase.py b/InterfaceQT4/monWidgetSimpBase.py
index c8202eb5..a03db34a 100644
--- a/InterfaceQT4/monWidgetSimpBase.py
+++ b/InterfaceQT4/monWidgetSimpBase.py
@@ -33,24 +33,28 @@ from qtSaisie              import SaisieValeur
 
 class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
 
-  def __init__(self,node,monSimpDef,nom,objSimp,parentQt):
-        Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt)
+  def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
+        Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
         self.parentQt.commandesLayout.insertWidget(-1,self)
         self.setFocusPolicy(Qt.StrongFocus)
         self.connect(self.lineEditVal,SIGNAL("returnPressed()"),self.LEValeurPressed)
+        self.AAfficher=self.lineEditVal
+        self.maCommande.listeAffichageWidget.append(self.lineEditVal)
 
-  def showEvent(self, event):
-      if self.prendLeFocus==1 :
-         self.activateWindow()
-         self.lineEditVal.setFocus()
-         self.prendLeFocus=0
-      QWidget.showEvent(self,event)
+
+  #def showEvent(self, event):
+  #    if self.prendLeFocus==1 :
+  #       self.activateWindow()
+  #       self.lineEditVal.setFocus()
+  #       self.prendLeFocus=0
+  #    QWidget.showEvent(self,event)
 
   def setValeurs(self):
        self.politique=PolitiqueUnique(self.node,self.editor)
        valeur=self.node.item.get_valeur()
        valeurTexte=self.politique.GetValeurTexte(valeur)
        chaine=QString("")
+
        if valeurTexte != None :
           from decimal import Decimal
           if isinstance(valeurTexte,Decimal):
@@ -58,10 +62,11 @@ class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
           elif repr(valeurTexte.__class__).find("PARAMETRE") > 0:
              chaine = QString(repr(valeur))
           else :
-             try :
-               chaine=QString("").setNum(valeurTexte)
-             except :
-               chaine=QString(str(valeurTexte))
+             #PN ????
+             #try :
+             #  chaine=QString("").setNum(valeurTexte)
+             #except :
+             chaine=QString(str(valeurTexte))
        self.lineEditVal.setText(chaine)
 
 
@@ -81,13 +86,12 @@ class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
 
 
   def LEValeurPressed(self):
-      print "LEValeurPressed"
-      print SaisieValeur.LEValeurPressed
+      if str(self.lineEditVal.text())=="" or str(self.lineEditVal.text())==None : return
       SaisieValeur.LEValeurPressed(self)
       self.parentQt.donneFocus()
+      self.setValeurs()
+      self.reaffiche()
       
-      print "je suis la aussi"
-      #PNPNPN - pas fait
       #if self.objSimp.parent.nom == "MODEL" :
       #   if self.objSimp.isvalid():
       #      self.objSimp.parent.change_fichier="1"