From: pascale.noyret Date: Thu, 15 Mar 2018 14:58:17 +0000 (+0100) Subject: tableau X-Git-Tag: V8_5_0rc2a2~18 X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=4edced4fdf39e012523949ce988f8bf6b67137e7;p=modules%2Feficas.git tableau --- diff --git a/InterfaceQT4/composimp.py b/InterfaceQT4/composimp.py index 20d23d76..ed6bddd1 100644 --- a/InterfaceQT4/composimp.py +++ b/InterfaceQT4/composimp.py @@ -196,12 +196,13 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal): num=self.item.object.definition.type[0].ntuple nomDeLaClasse = 'MonWidgetPlusieursTuple'+str(num) nomDuFichier = 'InterfaceQT4.monWidgetPlusieursTupleN' - try: + #try: + if 1 : _temp = __import__(nomDuFichier, globals(), locals(), [nomDeLaClasse], 0) MonWidgetPlusieursTuple = getattr(_temp,nomDeLaClasse) - except : - print ("Pas de Tuple de longueur : ", num) - print ("Prevenir la maintenance ") + #except : + # print ("Pas de Tuple de longueur : ", num) + # print ("Prevenir la maintenance ") widget=MonWidgetPlusieursTuple(self,maDefinition,monNom,monObjet,parentQt,maCommande) elif self.item.hasInto(): diff --git a/InterfaceQT4/gereIcones.py b/InterfaceQT4/gereIcones.py index 0787448d..4c278f36 100644 --- a/InterfaceQT4/gereIcones.py +++ b/InterfaceQT4/gereIcones.py @@ -223,7 +223,7 @@ class FacultatifOuOptionnel(object): def choixSaisi(self): fction=str(self.CBScripts.currentText()) numero= self.dictCommandes[fction] - self.node.AppelleFonction(numero,nodeTraite=self.node) + self.node.appelleFonction(numero,nodeTraite=self.node) #self.reaffiche() class ContientIcones(object): diff --git a/InterfaceQT4/monGroupeOptionnel.py b/InterfaceQT4/monGroupeOptionnel.py index 641369f0..9d6eaa2e 100644 --- a/InterfaceQT4/monGroupeOptionnel.py +++ b/InterfaceQT4/monGroupeOptionnel.py @@ -44,7 +44,6 @@ class MonRBButtonCustom(QCheckBox): mapalette.setColor( QPalette.Base, Qt.green ) self.setPalette( mapalette ); self.setText(tr(texte)) - print ('jjjjjjjjjjjj') try : monToolTip=monOptionnel.parentMC.dictToolTipMc[texte] self.setToolTip(monToolTip) @@ -97,18 +96,25 @@ class MonPBButtonCustom(QWidget,Ui_customPB): if couleur != None : print ( 'je change pour ', texte) self.monPb.setText(texte) - self.monPb.setStyleSheet('QPushButton {background-color: #A3C1DA; color: red;}') - mapalette=self.monPb.palette() - mapalette.setColor( QPalette.ButtonText, Qt.red ) - self.monPb.setPalette( mapalette ) + self.monPb.setStyleSheet( "background:rgb(229,62,30);\n" +"border-radius : 10px;\n" +"border-width : 30 px;\n" +"border-color : beige;\n" +"\n" +"") + + + #mapalette=self.monPb.palette() + #mapalette.setColor( QPalette.ButtonText, Qt.red ) + #self.monPb.setPalette( mapalette ) self.monPb.update() - self.update() + #self.update() try : monToolTip=monOptionnel.parentMC.dictToolTipMc[texte] self.monPb.setToolTip(monToolTip) except : pass - #self.monPb.setText(texte) + self.monPb.setText(texte) self.monPb.clicked.connect(self.ajoutMC) self.texte=texte diff --git a/InterfaceQT4/monWidgetPlusieursTuple.py b/InterfaceQT4/monWidgetPlusieursTuple.py index 9b3e3583..39061010 100644 --- a/InterfaceQT4/monWidgetPlusieursTuple.py +++ b/InterfaceQT4/monWidgetPlusieursTuple.py @@ -42,6 +42,13 @@ from InterfaceQT4.gereListe import GereListe from InterfaceQT4.gereListe import LECustom from Tuple2 import Ui_Tuple2 from Tuple3 import Ui_Tuple3 +from Tuple4 import Ui_Tuple4 +from Tuple5 import Ui_Tuple5 +from Tuple6 import Ui_Tuple6 +from Tuple7 import Ui_Tuple7 +from Tuple8 import Ui_Tuple8 +from Tuple9 import Ui_Tuple9 +from Tuple10 import Ui_Tuple10 #-------------------------- @@ -154,7 +161,6 @@ class TupleCustom(object) : #------------------------------------------------- class TupleCustom2(QWidget,Ui_Tuple2,TupleCustom): #------------------------------------------------- - def __init__(self,tailleTuple,parent,parentQt,index): #------------------- TupleCustom.__init__(self,tailleTuple,parent,parentQt,index) @@ -162,11 +168,68 @@ class TupleCustom2(QWidget,Ui_Tuple2,TupleCustom): #------------------------------------------------- class TupleCustom3(QWidget,Ui_Tuple3,TupleCustom): #------------------------------------------------- - def __init__(self,tailleTuple,parent,parentQt,index): #----------------------------------------------------- TupleCustom. __init__(self,tailleTuple,parent,parentQt,index) +#------------------------------------------------- +class TupleCustom3(QWidget,Ui_Tuple3,TupleCustom): +#------------------------------------------------- + def __init__(self,tailleTuple,parent,parentQt,index): + #------------------- + TupleCustom.__init__(self,tailleTuple,parent,parentQt,index) + +#------------------------------------------------- +class TupleCustom4(QWidget,Ui_Tuple4,TupleCustom): +#------------------------------------------------- + def __init__(self,tailleTuple,parent,parentQt,index): + #------------------- + TupleCustom.__init__(self,tailleTuple,parent,parentQt,index) + +#------------------------------------------------- +class TupleCustom5(QWidget,Ui_Tuple5,TupleCustom): +#------------------------------------------------- + def __init__(self,tailleTuple,parent,parentQt,index): + #------------------- + TupleCustom.__init__(self,tailleTuple,parent,parentQt,index) + +#------------------------------------------------- +class TupleCustom6(QWidget,Ui_Tuple6,TupleCustom): +#------------------------------------------------- + def __init__(self,tailleTuple,parent,parentQt,index): + #------------------- + TupleCustom.__init__(self,tailleTuple,parent,parentQt,index) + +#------------------------------------------------- +class TupleCustom7(QWidget,Ui_Tuple7,TupleCustom): +#------------------------------------------------- + def __init__(self,tailleTuple,parent,parentQt,index): + #------------------- + TupleCustom.__init__(self,tailleTuple,parent,parentQt,index) + +#------------------------------------------------- +class TupleCustom8(QWidget,Ui_Tuple8,TupleCustom): +#------------------------------------------------- + def __init__(self,tailleTuple,parent,parentQt,index): + #------------------- + TupleCustom.__init__(self,tailleTuple,parent,parentQt,index) + +#------------------------------------------------- +class TupleCustom9(QWidget,Ui_Tuple9,TupleCustom): +#------------------------------------------------- + def __init__(self,tailleTuple,parent,parentQt,index): + #------------------- + TupleCustom.__init__(self,tailleTuple,parent,parentQt,index) + +#------------------------------------------------- +class TupleCustom10(QWidget,Ui_Tuple10,TupleCustom): +#------------------------------------------------- + def __init__(self,tailleTuple,parent,parentQt,index): + #------------------- + TupleCustom.__init__(self,tailleTuple,parent,parentQt,index) + + + # -------------------------------------------- # @@ -212,16 +275,25 @@ class MonWidgetPlusieursTuple(Feuille,GereListe): self.indexDernierLabel=self.indexDernierLabel-1 return - if self.nbValeurs == 2 : nouveauLE = TupleCustom2(self.nbValeurs,self.scrollArea,self,self.indexDernierLabel) - else : nouveauLE = TupleCustom3(self.nbValeurs,self.scrollArea,self,self.indexDernierLabel) + nomCustomTuple='TupleCustom'+str(self.nbValeurs) + laClasseDuTuple=globals()[nomCustomTuple] + nouveauLE=laClasseDuTuple(self.nbValeurs,self.scrollArea,self,self.indexDernierLabel) + + #if self.nbValeurs == 2 : nouveauLE = TupleCustom2(self.nbValeurs,self.scrollArea,self,self.indexDernierLabel) + #else : nouveauLE = TupleCustom3(self.nbValeurs,self.scrollArea,self,self.indexDernierLabel) self.verticalLayoutLE.insertWidget(self.indexDernierLabel-1,nouveauLE) setattr(self,nomLineEdit,nouveauLE) if valeur != None : nouveauLE.setValeur(valeur) - self.listeAffichageWidget.append(nouveauLE.lineEditVal_1) - self.listeAffichageWidget.append(nouveauLE.lineEditVal_2) - if self.nbValeurs == 3 : self.listeAffichageWidget.append(nouveauLE.lineEditVal_3) + for i in range(self.nbValeurs) : + num=i+1 + nomLineEdit='lineEditVal_'+str(num) + lineEditVal=getattr(nouveauLE,nomLineEdit) + self.listeAffichageWidget.append(lineEditVal) + #self.listeAffichageWidget.append(nouveauLE.lineEditVal_1) + #self.listeAffichageWidget.append(nouveauLE.lineEditVal_2) + #if self.nbValeurs == 3 : self.listeAffichageWidget.append(nouveauLE.lineEditVal_3) self.etablitOrdre() @@ -243,7 +315,7 @@ class MonWidgetPlusieursTuple(Feuille,GereListe): if self.editor.code == 'PSEN' : self.RBListePush() valeurs=self.node.item.getValeur() min,max=self.node.item.getMinMax() - if max == "**" or max > 5 : aCreer=5 + if max == "**" or max > 8 : aCreer= 8 else : aCreer=max if valeurs == () or valeurs == None : @@ -344,30 +416,30 @@ class MonWidgetPlusieursTuple(Feuille,GereListe): t=tuple(liste[i:len(liste)]) i=i+self.nbValeurs if indexDernierRempli < self.indexDernierLabel: - print ('if') - nomLineEdit=self.nomLine+str(indexDernierRempli+1) - LEARemplir=getattr(self,nomLineEdit) - LEARemplir.lineEditVal_1.setText(str(t[0])) - LEARemplir.lineEditVal_2.setText(str(t[1])) - if self.nbValeurs== 3 : LEARemplir.lineEditVal_3.setText(str(t[2])) + + nomLEARemplir=self.nomLine+str(indexDernierRempli+1) + LEARemplir=getattr(self,nomLEARemplir) + for n in range(self.nbValeurs) : + nomLineEdit='lineEditVal_'+str(n+1) + lineEditVal=getattr(LEARemplir,nomLineEdit) + lineEditVal.setText(str(t[n])) else : - print ('eslse') # ne pas appeler ajoutLineEdit(t,False ) pb de boucle pb du a etablitOrdre et a listeWidgetAffichage qui bouge self.indexDernierLabel=self.indexDernierLabel+1 nomLineEdit=self.nomLine+str(self.indexDernierLabel) - if self.nbValeurs == 2 : nouveauLE = TupleCustom2(self.nbValeurs,self.scrollArea,self,self.indexDernierLabel) - else : nouveauLE = TupleCustom3(self.nbValeurs,self.scrollArea,self,self.indexDernierLabel) + nomCustomTuple='TupleCustom'+str(self.nbValeurs) + laClasseDuTuple=globals()[nomCustomTuple] + nouveauLE=laClasseDuTuple(self.nbValeurs,self.scrollArea,self,self.indexDernierLabel) - print (nomLineEdit) self.verticalLayoutLE.insertWidget(self.indexDernierLabel-1,nouveauLE) setattr(self,nomLineEdit,nouveauLE) - print (nouveauLE) nouveauLE.setValeur(t) - self.listeAffichageWidget.append(nouveauLE.lineEditVal_1) - self.listeAffichageWidget.append(nouveauLE.lineEditVal_2) - if self.nbValeurs == 3 : self.listeAffichageWidget.append(nouveauLE.lineEditVal_3) + for n in range(self.nbValeurs) : + nomLineEdit='lineEditVal_'+str(n+1) + lineEditVal=getattr(nouveauLE,nomLineEdit) + self.listeAffichageWidget.append(lineEditVal) indexDernierRempli = indexDernierRempli+1 self.etablitOrdre() diff --git a/InterfaceQT4/monWidgetPlusieursTuple2.py b/InterfaceQT4/monWidgetPlusieursTuple2.py deleted file mode 100644 index 10052d4f..00000000 --- a/InterfaceQT4/monWidgetPlusieursTuple2.py +++ /dev/null @@ -1,37 +0,0 @@ -# -*- coding: utf-8 -*- -# 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 -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# Modules Python -from __future__ import absolute_import -import types,os - -# Modules Eficas - -from InterfaceQT4.feuille import Feuille -from InterfaceQT4.monWidgetPlusieursTuple import MonWidgetPlusieursTuple -from desWidgetPlusieursTuple import Ui_WidgetPlusieursTuple - - -class MonWidgetPlusieursTuple2 (Ui_WidgetPlusieursTuple,MonWidgetPlusieursTuple): - - def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): - self.nbValeurs=2 - MonWidgetPlusieursTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) - - diff --git a/InterfaceQT4/monWidgetPlusieursTuple3.py b/InterfaceQT4/monWidgetPlusieursTuple3.py deleted file mode 100644 index 9b4b29c5..00000000 --- a/InterfaceQT4/monWidgetPlusieursTuple3.py +++ /dev/null @@ -1,36 +0,0 @@ -# -*- coding: utf-8 -*- -# 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 -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# Modules Python -from __future__ import absolute_import -import types,os - -# Modules Eficas - -from .feuille import Feuille -from .monWidgetPlusieursTuple import MonWidgetPlusieursTuple -from desWidgetPlusieursTuple import Ui_WidgetPlusieursTuple - - -class MonWidgetPlusieursTuple3 (Ui_WidgetPlusieursTuple,MonWidgetPlusieursTuple): - - def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): - self.nbValeurs=3 - MonWidgetPlusieursTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) - diff --git a/InterfaceQT4/monWidgetPlusieursTupleN.py b/InterfaceQT4/monWidgetPlusieursTupleN.py new file mode 100644 index 00000000..7b0dbb43 --- /dev/null +++ b/InterfaceQT4/monWidgetPlusieursTupleN.py @@ -0,0 +1,73 @@ +# -*- coding: utf-8 -*- +# 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# Modules Python +from __future__ import absolute_import +import types,os + +# Modules Eficas + +from .feuille import Feuille +from .monWidgetPlusieursTuple import MonWidgetPlusieursTuple +from desWidgetPlusieursTuple import Ui_WidgetPlusieursTuple + + +class MonWidgetPlusieursTuple2 (Ui_WidgetPlusieursTuple,MonWidgetPlusieursTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=2 + MonWidgetPlusieursTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetPlusieursTuple3 (Ui_WidgetPlusieursTuple,MonWidgetPlusieursTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=3 + +class MonWidgetPlusieursTuple4 (Ui_WidgetPlusieursTuple,MonWidgetPlusieursTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=4 + +class MonWidgetPlusieursTuple5 (Ui_WidgetPlusieursTuple,MonWidgetPlusieursTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=5 + MonWidgetPlusieursTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetPlusieursTuple6 (Ui_WidgetPlusieursTuple,MonWidgetPlusieursTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=6 + MonWidgetPlusieursTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetPlusieursTuple7 (Ui_WidgetPlusieursTuple,MonWidgetPlusieursTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=7 + MonWidgetPlusieursTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetPlusieursTuple8 (Ui_WidgetPlusieursTuple,MonWidgetPlusieursTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=8 + MonWidgetPlusieursTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetPlusieursTuple9 (Ui_WidgetPlusieursTuple,MonWidgetPlusieursTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=9 + MonWidgetPlusieursTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetPlusieursTuple10 (Ui_WidgetPlusieursTuple,MonWidgetPlusieursTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=10 + MonWidgetPlusieursTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + diff --git a/InterfaceQT4/monWidgetSimpTuple2.py b/InterfaceQT4/monWidgetSimpTuple2.py deleted file mode 100644 index 4440639d..00000000 --- a/InterfaceQT4/monWidgetSimpTuple2.py +++ /dev/null @@ -1,49 +0,0 @@ -# -*- coding: utf-8 -*- -# 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 -# License as published by the Free Software Foundation; either -# version 2.1 of the License. -# -# This library is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU -# Lesser General Public License for more details. -# -# You should have received a copy of the GNU Lesser General Public -# License along with this library; if not, write to the Free Software -# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA -# -# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com -# -# Modules Python -from __future__ import absolute_import -import types,os - -# Modules Eficas -#from PyQt4.QtGui import * -#from PyQt4.QtCore import * -from Extensions.i18n import tr - -from InterfaceQT4.feuille import Feuille -from InterfaceQT4.monWidgetSimpTuple import MonWidgetSimpTuple -from desWidgetTuple2 import Ui_WidgetTuple2 - - -class MonWidgetSimpTuple2 (Ui_WidgetTuple2,MonWidgetSimpTuple): - - def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): - self.nbValeurs=2 - MonWidgetSimpTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) - #self.maCommande.listeAffichageWidget.append(self.lineEditVal2) - if self.objSimp.isImmuable() : - self.lineEditVal1.setDisabled(True) - self.lineEditVal2.setDisabled(True) - self.lineEditVal1.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n") - self.lineEditVal2.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n") - self.lineEditVal1.setToolTip(tr("Valeur non modifiable")) - self.lineEditVal2.setToolTip(tr("Valeur non modifiable")) - else : - self.maCommande.listeAffichageWidget.append(self.lineEditVal1) - diff --git a/InterfaceQT4/monWidgetSimpTupleN.py b/InterfaceQT4/monWidgetSimpTupleN.py new file mode 100644 index 00000000..10eb8092 --- /dev/null +++ b/InterfaceQT4/monWidgetSimpTupleN.py @@ -0,0 +1,103 @@ +# -*- coding: utf-8 -*- +# 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 +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +# Modules Python +from __future__ import absolute_import +import types,os + +# Modules Eficas +#from PyQt4.QtGui import * +#from PyQt4.QtCore import * +from Extensions.i18n import tr + +from InterfaceQT4.feuille import Feuille +from InterfaceQT4.monWidgetSimpTuple import MonWidgetSimpTuple +from desWidgetTuple2 import Ui_WidgetTuple2 +from desWidgetTuple3 import Ui_WidgetTuple3 +from desWidgetTuple4 import Ui_WidgetTuple4 +from desWidgetTuple5 import Ui_WidgetTuple5 +from desWidgetTuple6 import Ui_WidgetTuple6 +from desWidgetTuple7 import Ui_WidgetTuple7 +from desWidgetTuple8 import Ui_WidgetTuple8 +from desWidgetTuple9 import Ui_WidgetTuple9 +from desWidgetTuple10 import Ui_WidgetTuple10 + + +class MonWidgetSimpTuple2 (Ui_WidgetTuple2,MonWidgetSimpTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=2 + MonWidgetSimpTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + if self.objSimp.isImmuable() : + self.lineEditVal1.setDisabled(True) + self.lineEditVal2.setDisabled(True) + self.lineEditVal1.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n") + self.lineEditVal2.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n") + self.lineEditVal1.setToolTip(tr("Valeur non modifiable")) + self.lineEditVal2.setToolTip(tr("Valeur non modifiable")) + else : + self.maCommande.listeAffichageWidget.append(self.lineEditVal1) + +class MonWidgetSimpTuple3 (Ui_WidgetTuple3,MonWidgetSimpTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=3 + MonWidgetSimpTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + if self.objSimp.isImmuable() : + self.lineEditVal1.setDisabled(True) + self.lineEditVal2.setDisabled(True) + self.lineEditVal1.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n") + self.lineEditVal2.setStyleSheet("background:rgb(244,244,244);\n" "border:0px;\n") + self.lineEditVal1.setToolTip(tr("Valeur non modifiable")) + self.lineEditVal2.setToolTip(tr("Valeur non modifiable")) + else : + self.maCommande.listeAffichageWidget.append(self.lineEditVal1) + +class MonWidgetSimpTuple4 (Ui_WidgetTuple4,MonWidgetSimpTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=4 + MonWidgetSimpTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetSimpTuple5 (Ui_WidgetTuple5,MonWidgetSimpTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=5 + MonWidgetSimpTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetSimpTuple6 (Ui_WidgetTuple6,MonWidgetSimpTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=6 + MonWidgetSimpTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetSimpTuple7 (Ui_WidgetTuple7,MonWidgetSimpTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=7 + MonWidgetSimpTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetSimpTuple8 (Ui_WidgetTuple8,MonWidgetSimpTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=8 + MonWidgetSimpTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetSimpTuple9 (Ui_WidgetTuple9,MonWidgetSimpTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=9 + MonWidgetSimpTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) + +class MonWidgetSimpTuple10 (Ui_WidgetTuple10,MonWidgetSimpTuple): + def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande): + self.nbValeurs=10 + MonWidgetSimpTuple.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande) diff --git a/UiQT5/Tuple8.ui b/UiQT5/Tuple8.ui index b2001489..169b2608 100644 --- a/UiQT5/Tuple8.ui +++ b/UiQT5/Tuple8.ui @@ -6,7 +6,7 @@ 0 0 - 1019 + 1159 46 @@ -270,6 +270,42 @@ border:0px; background:rgb(235,235,235); +border:0px; + + + + + + + <html><head/><body><p><span style=" font-size:14pt;">,</span></p></body></html> + + + + + + + + 0 + 0 + + + + + 0 + 25 + + + + + 10000 + 16777215 + + + + Qt::StrongFocus + + + background:rgb(235,235,235); border:0px; diff --git a/UiQT5/Tuple9.ui b/UiQT5/Tuple9.ui index 344a28d9..6a7f25a1 100644 --- a/UiQT5/Tuple9.ui +++ b/UiQT5/Tuple9.ui @@ -6,7 +6,7 @@ 0 0 - 1159 + 1299 46 @@ -20,6 +20,18 @@ Form + + 0 + + + 0 + + + 0 + + + 0 + @@ -274,6 +286,13 @@ border:0px; + + + + <html><head/><body><p><span style=" font-size:14pt;">,</span></p></body></html> + + + @@ -310,6 +329,35 @@ border:0px; + + + + + 0 + 0 + + + + + 0 + 25 + + + + + 10000 + 16777215 + + + + Qt::StrongFocus + + + background:rgb(235,235,235); +border:0px; + + + diff --git a/UiQT5/desWidgetTableau.ui b/UiQT5/desWidgetTableau.ui index b6f1cd38..eb20bf2e 100644 --- a/UiQT5/desWidgetTableau.ui +++ b/UiQT5/desWidgetTableau.ui @@ -26,6 +26,12 @@ Form + + 0 + + + 0 + @@ -92,6 +98,22 @@ + + + + Qt::Vertical + + + QSizePolicy::Fixed + + + + 20 + 40 + + + + @@ -205,7 +227,8 @@ - .. + + @@ -243,7 +266,8 @@ - .. + + @@ -419,8 +443,8 @@ 0 0 - 1091 - 524 + 1109 + 526 @@ -430,6 +454,12 @@ + + 2 + + + 0 + @@ -487,7 +517,8 @@ - .. + +