Merge V9 dans Master

[tools/eficas.git] / InterfaceQT4 / monWidgetSimpBase.py

diff --git a/InterfaceQT4/monWidgetSimpBase.py b/InterfaceQT4/monWidgetSimpBase.py
index 78fc1a7592d4e0c4d0261ab065339ecf3d044b9d..ef4c5cea810fda7efdd2b1d661fd0a85da1b12ea 100644 (file)
--- a/InterfaceQT4/monWidgetSimpBase.py
+++ b/InterfaceQT4/monWidgetSimpBase.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2013   EDF R&D
+# Copyright (C) 2007-2017   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -42,7 +42,7 @@ class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
         Feuille.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
         self.parentQt.commandesLayout.insertWidget(-1,self,1)
         self.setFocusPolicy(Qt.StrongFocus)
-        self.lineEditVal.returnPressed.connect(self.LEValeurPressed)
+        self.lineEditVal.returnPressed.connect(self.LEvaleurPressed)
         self.AAfficher=self.lineEditVal
         self.maCommande.listeAffichageWidget.append(self.lineEditVal)
         self.lineEditVal.focusInEvent=self.monFocusInEvent
@@ -55,8 +55,8 @@ class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
 
   def monFocusOutEvent(self,event):
       if self.oldValeurTexte != self.lineEditVal.text():
-         self.LEValeurPressed()
          self.oldValeurTexte= self.lineEditVal.text()
+         self.LEvaleurPressed()
       QLineEdit.focusOutEvent(self.lineEditVal,event)
 
   #def showEvent(self, event):
@@ -69,8 +69,8 @@ class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
   def setValeurs(self):
        #print ("dans setValeurs")
        self.politique=PolitiqueUnique(self.node,self.editor)
-       valeur=self.node.item.get_valeur()
-       valeurTexte=self.politique.GetValeurTexte(valeur)
+       valeur=self.node.item.getValeur()
+       valeurTexte=self.politique.getValeurTexte(valeur)
        chaine=""
 
        if valeurTexte != None :
@@ -107,15 +107,18 @@ class MonWidgetSimpBase (Ui_WidgetSimpBase,Feuille):
       return commentaire
 
 
-  def LEValeurPressed(self):
-      if str(self.lineEditVal.text())=="" or str(self.lineEditVal.text())==None : return
-      SaisieValeur.LEValeurPressed(self)
+  def LEvaleurPressed(self):
+      # pour les soucis d encoding
+      try :
+        if str(self.lineEditVal.text())=="" or str(self.lineEditVal.text())==None : return
+      except : pass
+      SaisieValeur.LEvaleurPressed(self)
       self.parentQt.donneFocus()
       self.setValeurs()
       self.reaffiche()
       
       #if self.objSimp.parent.nom == "MODEL" :
-      #   if self.objSimp.isvalid():
+      #   if self.objSimp.isValid():
       #      self.objSimp.parent.change_fichier="1"
-            #self.node.item.parent.build_include(None,"")
+            #self.node.item.parent.buildInclude(None,"")