bug

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

diff --git a/InterfaceQT4/monWidgetSimpComplexe.py b/InterfaceQT4/monWidgetSimpComplexe.py
index 5e219dc58950989e638761820e64a6034324fd80..6775a18e7d8731e63da034e6b6b04122c1a28a7c 100644 (file)
--- a/InterfaceQT4/monWidgetSimpComplexe.py
+++ b/InterfaceQT4/monWidgetSimpComplexe.py
@@ -21,8 +21,14 @@
 import string,types,os
 
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+if monEnvQT5:
+    from PyQt5.QtWidgets import QLineEdit, QRadioButton
+    from PyQt5.QtCore import Qt
+else :
+    from PyQt4.QtGui  import *
+    from PyQt4.QtCore import *
+
+
 from Extensions.i18n import tr
 
 from feuille                import Feuille
@@ -33,15 +39,27 @@ from qtSaisie               import SaisieValeur
 
 class MonWidgetSimpComplexe (Ui_WidgetSimpComplexe,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.LEImag,SIGNAL("returnPressed()"),self.LEImagRPressed)
-        self.connect(self.LEReel,SIGNAL("returnPressed()"),self.LEReelRPressed)
-        self.connect(self.RBRI,SIGNAL("clicked()"), self.ValeurPressed )
-        self.connect(self.RBMP,SIGNAL("clicked()"), self.ValeurPressed )
-        self.connect(self.LEComp,SIGNAL("returnPressed()"),self.LECompRPressed)
+        if monEnvQT5 :
+          self.LEImag.returnPressed.connect(self.LEImagRPressed)
+          self.LEReel.returnPressed.connect()"),self.LEReelRPressed)
+          self.RBRI.clicked.connect(self.ValeurPressed )
+          self.RBMP.clicked.connect(self.ValeurPressed )
+          self.LEComp.returnPressed.connect(self.LECompRPressed)
+        else :
+          self.connect(self.LEImag,SIGNAL("returnPressed()"),self.LEImagRPressed)
+          self.connect(self.LEReel,SIGNAL("returnPressed()"),self.LEReelRPressed)
+          self.connect(self.RBRI,SIGNAL("clicked()"), self.ValeurPressed )
+          self.connect(self.RBMP,SIGNAL("clicked()"), self.ValeurPressed )
+          self.connect(self.LEComp,SIGNAL("returnPressed()"),self.LECompRPressed)
+        self.maCommande.listeAffichageWidget.append(self.LEComp)
+        #self.maCommande.listeAffichageWidget.append(self.RBRI)
+        #self.maCommande.listeAffichageWidget.append(self.RBMP)
+        #self.maCommande.listeAffichageWidget.append(self.LEReel)
+        #self.maCommande.listeAffichageWidget.append(self.LEImag)
 
 
   def setValeurs(self):
@@ -137,6 +155,7 @@ class MonWidgetSimpComplexe (Ui_WidgetSimpComplexe,Feuille):
               return
           valeur=  self.getValeurComp()
       self.politique.RecordValeur(valeur)
+      self.reaffiche()
       self.parentQt.donneFocus()
 
   def getValeurRI(self):