X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2FmonWidgetSimpComplexe.py;h=6775a18e7d8731e63da034e6b6b04122c1a28a7c;hb=c286259382c721a299673774031ec352d873b658;hp=fe7c54b8ef8c6d5bf8299ed437e76f954f8e850a;hpb=df0e1a1f57e70d3d99dd7fb381845500c3d3c6dd;p=tools%2Feficas.git diff --git a/InterfaceQT4/monWidgetSimpComplexe.py b/InterfaceQT4/monWidgetSimpComplexe.py index fe7c54b8..6775a18e 100644 --- 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 @@ -37,11 +43,18 @@ class MonWidgetSimpComplexe (Ui_WidgetSimpComplexe,Feuille): 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) @@ -142,6 +155,7 @@ class MonWidgetSimpComplexe (Ui_WidgetSimpComplexe,Feuille): return valeur= self.getValeurComp() self.politique.RecordValeur(valeur) + self.reaffiche() self.parentQt.donneFocus() def getValeurRI(self):