]> SALOME platform Git repositories - tools/eficas.git/commitdiff
Salome HOME
tableau
authorpascale.noyret <pascale.noyret@edf.fr>
Thu, 15 Mar 2018 14:58:17 +0000 (15:58 +0100)
committerpascale.noyret <pascale.noyret@edf.fr>
Thu, 15 Mar 2018 14:58:17 +0000 (15:58 +0100)
12 files changed:
InterfaceQT4/composimp.py
InterfaceQT4/gereIcones.py
InterfaceQT4/monGroupeOptionnel.py
InterfaceQT4/monWidgetPlusieursTuple.py
InterfaceQT4/monWidgetPlusieursTuple2.py [deleted file]
InterfaceQT4/monWidgetPlusieursTuple3.py [deleted file]
InterfaceQT4/monWidgetPlusieursTupleN.py [new file with mode: 0644]
InterfaceQT4/monWidgetSimpTuple2.py [deleted file]
InterfaceQT4/monWidgetSimpTupleN.py [new file with mode: 0644]
UiQT5/Tuple8.ui
UiQT5/Tuple9.ui
UiQT5/desWidgetTableau.ui

index 20d23d764a0a97c13e0c665fca4f0149f17ba2ff..ed6bddd1d358ac94298e57f54c3751c4a78133f5 100644 (file)
@@ -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():
index 0787448de1e794843493b8f17d9606100ca16e4b..4c278f36bc1331062b5be6c3e90e941cdd502336 100644 (file)
@@ -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):
index 641369f03c1e6cc3b6bbe912428e285970bb3294..9d6eaa2e04f6e5f0c89191c1e78cb08d13330a78 100644 (file)
@@ -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
index 9b3e3583fe8b74de2ebf1a975744c8939ac13090..39061010c4864a0ac8c0662c36b56d3e0641d240 100644 (file)
@@ -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 (file)
index 10052d4..0000000
+++ /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 (file)
index 9b4b29c..0000000
+++ /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 (file)
index 0000000..7b0dbb4
--- /dev/null
@@ -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 (file)
index 4440639..0000000
+++ /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 (file)
index 0000000..10eb809
--- /dev/null
@@ -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)
index b2001489927d6c6171fe062ab8ec8ae1f6ade21e..169b2608aea22ace8b5152ae71dcbe1f0140dace 100644 (file)
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1019</width>
+    <width>1159</width>
     <height>46</height>
    </rect>
   </property>
@@ -270,6 +270,42 @@ border:0px;</string>
      </property>
      <property name="styleSheet">
       <string notr="true">background:rgb(235,235,235);
+border:0px;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QLabel" name="label_13">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;,&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="LECustomTuple" name="lineEditVal_8">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>10000</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:rgb(235,235,235);
 border:0px;</string>
      </property>
     </widget>
index 344a28d93fcb9947d7f853a33df4a76aee1334cf..6a7f25a14e117313baec6b47ee966c5b3522ab41 100644 (file)
@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>1159</width>
+    <width>1299</width>
     <height>46</height>
    </rect>
   </property>
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>0</number>
+   </property>
    <item>
     <widget class="QLabel" name="label_5">
      <property name="text">
@@ -274,6 +286,13 @@ border:0px;</string>
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="QLabel" name="label_14">
+     <property name="text">
+      <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-size:14pt;&quot;&gt;,&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="LECustomTuple" name="lineEditVal_8">
      <property name="sizePolicy">
@@ -310,6 +329,35 @@ border:0px;</string>
      </property>
     </widget>
    </item>
+   <item>
+    <widget class="LECustomTuple" name="lineEditVal_9">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>0</width>
+       <height>25</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>10000</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="focusPolicy">
+      <enum>Qt::StrongFocus</enum>
+     </property>
+     <property name="styleSheet">
+      <string notr="true">background:rgb(235,235,235);
+border:0px;</string>
+     </property>
+    </widget>
+   </item>
    <item>
     <widget class="QLabel" name="label_7">
      <property name="text">
index b6f1cd380c7376a3ea10281b1ce437c1332389be..eb20bf2e1323d7f5bf73583133b9d0e1d41b53d0 100644 (file)
    <string>Form</string>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_5">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
    <item>
     <layout class="QVBoxLayout" name="verticalLayout_4">
      <item>
        </item>
       </layout>
      </item>
+     <item>
+      <spacer name="verticalSpacer_3">
+       <property name="orientation">
+        <enum>Qt::Vertical</enum>
+       </property>
+       <property name="sizeType">
+        <enum>QSizePolicy::Fixed</enum>
+       </property>
+       <property name="sizeHint" stdset="0">
+        <size>
+         <width>20</width>
+         <height>40</height>
+        </size>
+       </property>
+      </spacer>
+     </item>
      <item>
       <widget class="QFrame" name="frame">
        <property name="sizePolicy">
           </property>
           <property name="icon">
            <iconset theme="go-up">
-            <normaloff>.</normaloff>.</iconset>
+            <normaloff/>
+           </iconset>
           </property>
           <property name="iconSize">
            <size>
           </property>
           <property name="icon">
            <iconset theme="go-down">
-            <normaloff>.</normaloff>.</iconset>
+            <normaloff/>
+           </iconset>
           </property>
           <property name="iconSize">
            <size>
             <rect>
              <x>0</x>
              <y>0</y>
-             <width>1091</width>
-             <height>524</height>
+             <width>1109</width>
+             <height>526</height>
             </rect>
            </property>
            <property name="sizePolicy">
             </sizepolicy>
            </property>
            <layout class="QVBoxLayout" name="verticalLayoutLE">
+            <property name="spacing">
+             <number>2</number>
+            </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
             <item>
              <spacer name="verticalSpacer_4">
               <property name="orientation">
          </property>
          <property name="icon">
           <iconset theme="text-x-generic">
-           <normaloff>.</normaloff>.</iconset>
+           <normaloff/>
+          </iconset>
          </property>
          <property name="iconSize">
           <size>