gestion des liste et bugs

diff --git a/InterfaceQT4/compofact.py b/InterfaceQT4/compofact.py
index 6dfe35844516a31fb987e32350473784c104e8ff..ce43add587f613a65170b53a5e4fa604c8041bed 100644 (file)
--- a/InterfaceQT4/compofact.py
+++ b/InterfaceQT4/compofact.py
@@ -38,6 +38,10 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel):
         if hasattr(parentQt,'niveau'): self.niveau=parentQt.niveau+1
         else : self.niveau=1
         #if  hasattr(self,'plie') :print self.item.nom, self.plie
+        #if maDefinition.sensLayout == 'horizontal':
+        #   from .monWidgetFact import MonWidgetFactHorizontal
+        #   widget=MonWidgetFactHorizontal(self,self.editor,parentQt,maDefinition,monObjet,self.niveau,maCommande)
+        #elif  hasattr(self,'plie') and self.plie==True : 
         if  hasattr(self,'plie') and self.plie==True : 
            from .monWidgetFactPlie import MonWidgetFactPlie
            widget=MonWidgetFactPlie(self,self.editor,parentQt,maDefinition,monObjet,self.niveau,maCommande)

diff --git a/InterfaceQT4/composimp.py b/InterfaceQT4/composimp.py
index 88a18a27ed1de8d22d10aaf2350481f70a69eb09..19b48c74bc115694a7b4b4735b097ec6251be2a6 100644 (file)
--- a/InterfaceQT4/composimp.py
+++ b/InterfaceQT4/composimp.py
@@ -174,9 +174,12 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):
                if len(listeAAfficher) == 0:
                  from .monWidgetVide import MonWidgetVide
                  widget = MonWidgetVide(self,maDefinition,monNom,monObjet,parentQt,maCommande)
-               else :
+               elif self.item in self.editor.listeDesListesOuvertes or not(self.editor.afficheListesPliees) : 
                  from .monWidgetPlusieursASSDIntoOrdonne import MonWidgetPlusieursASSDIntoOrdonne
                  widget=MonWidgetPlusieursASSDIntoOrdonne(self,maDefinition,monNom,monObjet,parentQt,maCommande)
+               else :
+                  from .monWidgetPlusieursPlie import MonWidgetPlusieursPlieASSD
+                  widget=MonWidgetPlusieursPlieASSD(self,maDefinition,monNom,monObjet,parentQt,maCommande)
           elif self.item.wait_tuple() :
             if self.item.object.definition.type[0].ntuple == 2:
                from .monWidgetPlusieursTuple2 import MonWidgetPlusieursTuple2
@@ -197,7 +200,6 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodeMinimal):
                   from .monWidgetPlusieursPlie import MonWidgetPlusieursPlie
                   widget=MonWidgetPlusieursPlie(self,maDefinition,monNom,monObjet,parentQt,maCommande)
             else :
-# tres vite pour le tag mais devra etre gere dans configuration
                if self.item in self.editor.listeDesListesOuvertes or not(self.editor.afficheListesPliees) : 
                   from .monWidgetPlusieursIntoOrdonne import MonWidgetPlusieursIntoOrdonne
                   widget=MonWidgetPlusieursIntoOrdonne(self,maDefinition,monNom,monObjet,parentQt,maCommande)

diff --git a/InterfaceQT4/editor.py b/InterfaceQT4/editor.py
index 74e86fabb32f1025f87d30fc57ac4f929421537d..0a9efa1ad8b9c6744c3a1a91591d796d795c02ad 100755 (executable)
--- a/InterfaceQT4/editor.py
+++ b/InterfaceQT4/editor.py
@@ -972,13 +972,13 @@ class JDCEditor(Ui_baseWidget,QWidget):
     #------------#
       fonction="run"+self.code
       #print fonction
-      if fonction in JDCEditor.__dict__: JDCEditor.__dict__[fonction],(self,)
+      if fonction in JDCEditor.__dict__: JDCEditor.__dict__[fonction](self,)
 
     #------------#
     def saveRun(self):
     #------------#
       fonction="saveRun"+self.code
-      if fonction in JDCEditor.__dict__: JDCEditor.__dict__[fonction],(self,)
+      if fonction in JDCEditor.__dict__: JDCEditor.__dict__[fonction](self,)
 
     #---------------#
     def runMAP(self):

diff --git a/InterfaceQT4/eficas_go.py b/InterfaceQT4/eficas_go.py
index ee02d304910e2127e820e61639ffdf8eb153e161..8ca631a543a9330e3df62bdbb40dc0a01d3207d4 100755 (executable)
--- a/InterfaceQT4/eficas_go.py
+++ b/InterfaceQT4/eficas_go.py
@@ -49,7 +49,7 @@ def lance_eficas(code=None,fichier=None,ssCode=None,multi=False,langue='en'):
     if options.code!= None : code=options.code
     if options.ssCode!= None : ssCode=options.ssCode
 
-    from .qtEficas import Appli
+    from InterfaceQT4.qtEficas import Appli
     app = QApplication(sys.argv)
     Eficas=Appli(code=code,ssCode=ssCode,multi=multi,langue=langue)
     Eficas.show()

diff --git a/InterfaceQT4/gereListe.py b/InterfaceQT4/gereListe.py
index 6b568d25d781d37e16a72ca56739e802c3e398e0..f08adac3b21b98ee0d86001a12781016aed31d9a 100644 (file)
--- a/InterfaceQT4/gereListe.py
+++ b/InterfaceQT4/gereListe.py
@@ -48,9 +48,11 @@ class LECustom(QLineEdit):
         Constructor
         """
         QLineEdit.__init__(self,parent)
+        
         self.parentQt=parentQt
         self.num=i
         self.dansUnTuple=False
+        self.numDsLaListe=-1
 
  def focusInEvent(self,event):
      #print "dans focusInEvent de LECustom"
@@ -61,11 +63,16 @@ class LECustom(QLineEdit):
      QLineEdit.focusInEvent(self,event)
 
  def focusOutEvent(self,event):
-     #print "dans focusOutEvent de LECustom"
      self.setStyleSheet("border: 0px")
      if self.dansUnTuple    : self.setStyleSheet("background:rgb(235,235,235); border: 0px;")
      elif self.num % 2 == 1 : self.setStyleSheet("background:rgb(210,210,210)")
      else                   : self.setStyleSheet("background:rgb(235,235,235)")
+       
+    
+     if isinstance(self,LECustomTuple)  and  not self.tupleCustomParent.inFocusOutEvent:
+         self.tupleCustomParent.inFocusOutEvent=True
+         self.tupleCustomParent.valueChange()
+         self.tupleCustomParent.inFocusOutEvent=False
      QLineEdit.focusOutEvent(self,event)
 
  def clean(self):
@@ -86,6 +93,7 @@ class LECustomTuple(LECustom):
    #  index sera mis a jour par TupleCustom
    parentQt=parent.parent().parent().parent()
    LECustom. __init__(self,parent,parentQt,0)
+   #print (dir(self))
 
 # ---------------------------- #
 class MonLabelListeClic(QLabel):

diff --git a/InterfaceQT4/gereRegles.py b/InterfaceQT4/gereRegles.py
index 0e303918e66905fad6198dc89250011587aade85..78a5893a8bda29649e89be820d42908a94a703ea 100644 (file)
--- a/InterfaceQT4/gereRegles.py
+++ b/InterfaceQT4/gereRegles.py
@@ -25,6 +25,7 @@ except : pass
 
 from PyQt5.QtCore import Qt
 from  .monViewRegles  import ViewRegles
+from Extensions.i18n import tr
 
 class GereRegles(object) :
 
@@ -60,7 +61,7 @@ class GereRegles(object) :
                 else :
                    self.liste.append((ligne,Qt.red))
              self.liste.append(("",Qt.red))
-       if self.liste==[] : self.liste(tr("pas de regle de construction pour ce jeu de commandes",Qt.black))
+       if self.liste==[] : self.liste.append(("pas de regle de construction pour ce jeu de commandes",Qt.black))
                
 
    def AfficheRegles(self):

diff --git a/InterfaceQT4/monWidgetCommande.py b/InterfaceQT4/monWidgetCommande.py
index becfee22f13f21faa0bda111354dd1815e184802..0543e61a80b741dc5213abbb24fc8c5fd4af1349 100644 (file)
--- a/InterfaceQT4/monWidgetCommande.py
+++ b/InterfaceQT4/monWidgetCommande.py
@@ -71,7 +71,7 @@ class MonWidgetCommande(Ui_WidgetCommande,Groupe):
       self.labelNomCommande.setText(tr(self.obj.nom))
 
 
-      if self.editor.closeFrameRechercheCommande==True : self.closeAutreCommande()
+      if self.editor.closeAutreCommande==True  : self.closeAutreCommande()
       else :
         try :
            self.bCatalogue.clicked.connect(self.afficheCatalogue)

diff --git a/InterfaceQT4/monWidgetFact.py b/InterfaceQT4/monWidgetFact.py
index 012afc11bf8f2123abad018bc77a3a59d566f6b6..ad2b42d8b2bd88072ade9789051fe6cf59fff285 100644 (file)
--- a/InterfaceQT4/monWidgetFact.py
+++ b/InterfaceQT4/monWidgetFact.py
@@ -26,10 +26,11 @@ from PyQt5.QtWidgets import QWidget
 
 from .groupe import Groupe
 from desWidgetFact import Ui_WidgetFact
+from desWidgetFactHorizon import Ui_WidgetFactHorizon
 from Extensions.i18n import tr
 # Import des panels
 
-class MonWidgetFact(Ui_WidgetFact,Groupe):
+class MonWidgetFactCommun(Groupe):
   """
   """
   def __init__(self,node,editor,parentQt,definition, obj, niveau,commande):
@@ -55,3 +56,11 @@ class MonWidgetFact(Ui_WidgetFact,Groupe):
   def delayAffiche(self):
       #print "delayAffiche, self.doitAfficherOptionnel = ", self.doitAfficherOptionnel
       if self.doitAfficherOptionnel and self.editor.code != "CARMELCND" :self.afficheOptionnel()
+
+class MonWidgetFact(Ui_WidgetFact,MonWidgetFactCommun):
+  def __init__(self,node,editor,parentQt,definition, obj, niveau,commande):
+      MonWidgetFactCommun.__init__(self,node,editor,parentQt, definition,obj,niveau,commande)
+
+class MonWidgetFactHorizontal(Ui_WidgetFactHorizon,MonWidgetFactCommun):
+  def __init__(self,node,editor,parentQt,definition, obj, niveau,commande):
+      MonWidgetFactCommun.__init__(self,node,editor,parentQt, definition,obj,niveau,commande)

diff --git a/InterfaceQT4/monWidgetPlusieursBase.py b/InterfaceQT4/monWidgetPlusieursBase.py
index edd81e450b7b49d8f7020fa23d110eab0a05c7ca..a9fe55119a59574ec83cc781fcd02d13b11fe8f1 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursBase.py
+++ b/InterfaceQT4/monWidgetPlusieursBase.py
@@ -73,6 +73,14 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie)
           icon3 = QIcon(fichier2)
           self.BSelectFichier.setIcon(icon3)
           self.BSelectFichier.setIconSize(QSize(32, 32))
+        if self.editor.salome :
+          icon=QIcon(self.repIcon+"/MoinsBleu.png")
+          self.RBMoins.setIcon(icon)
+          icon=QIcon(self.repIcon+"/PlusBleu.png")
+          self.RBPlus.setIcon(icon)
+          icon=QIcon(self.repIcon+"/verre-loupe-icone-6087-64.png")
+          self.RBVoisListe.setIcon(icon)
+
 
         self.listeValeursCourantes=self.node.item.GetListeValeurs()
         if self.monSimpDef.max != "**"  and self.monSimpDef.max < 7: 

diff --git a/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py b/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py
index d02ff47176dd45331a581c2816850f9df5fe73af..c51ff7b8f7ba5de72a1509e6e3cb028fce5d7c92 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py
+++ b/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py
@@ -54,7 +54,7 @@ class MonWidgetPlusieursIntoOrdonne (Ui_WidgetPlusieursIntoOrdonne, Feuille,Gere
         self.filtre=""
         Feuille.__init__(self,node,monSimpDef,nom,objSimp,parent,commande)
         GereListe.__init__(self)
-        self.finCommentaireListe()
+        #self.finCommentaireListe()
         self.gereIconePlier()
         self.listeValeursCourantes=self.node.item.GetListeValeurs()
         try :
@@ -63,7 +63,8 @@ class MonWidgetPlusieursIntoOrdonne (Ui_WidgetPlusieursIntoOrdonne, Feuille,Gere
           # cas ou on ne peut rien ajouter
           pass 
         self.prepareListeResultat()
-        if len(self.listeAAfficher) < 8 : self.frameRecherche2.close()
+        if len(self.listeAAfficher) < 20 : self.frameRecherche2.close()
+        if len(self.listeAAfficher) < 8 : self.frameRecherche.close()
         self.adjustSize()
         if sys.platform[0:5]!="linux":
           repIcon=self.node.editor.appliEficas.repIcon

diff --git a/InterfaceQT4/monWidgetPlusieursPlie.py b/InterfaceQT4/monWidgetPlusieursPlie.py
index 60f96104ae220eae6579e65443b041788d4191cc..5a515f5866971840be85d70e450e238551d6ea49 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursPlie.py
+++ b/InterfaceQT4/monWidgetPlusieursPlie.py
@@ -102,3 +102,21 @@ class MonWidgetPlusieursPlie (Ui_WidgetPlusieursPlie,Feuille):
          self.editor.affiche_infos(str(listeValeur) + '   ' +comm,Qt.red)
          self.lineEditVal.setText('')
        
+class MonWidgetPlusieursPlieASSD (MonWidgetPlusieursPlie):
+
+  def __init__(self,node,monSimpDef,nom,objSimp,parentQt,commande):
+        MonWidgetPlusieursPlie.__init__(self,node,monSimpDef,nom,objSimp,parentQt,commande)
+        self.lineEditVal.setReadOnly(True)
+
+  def setValeurs(self):
+       self.listeValeursCourantes=self.node.item.GetListeValeurs()
+       self.politique=PolitiquePlusieurs(self.node,self.editor)
+       if self.listeValeursCourantes == []  :  self.lineEditVal.setText(""); return
+       txt="["
+       for elt in self.listeValeursCourantes :
+            txt= txt+ (str(elt)) + ","
+       txt= txt + "]"
+       self.lineEditVal.setText(txt)
+
+  def valeurEntree(self):
+      pass

diff --git a/InterfaceQT4/monWidgetPlusieursTuple.py b/InterfaceQT4/monWidgetPlusieursTuple.py
index 742d69f8404598ea0c585b660d896a92cd1c88c0..b4b9408d122e4eb6165e85834ffbb587982c2273 100644 (file)
--- a/InterfaceQT4/monWidgetPlusieursTuple.py
+++ b/InterfaceQT4/monWidgetPlusieursTuple.py
@@ -53,6 +53,7 @@ class TupleCustom(object) :
       self.parentQt=parentQt
       self.valeur=None
       self.index=index
+      self.inFocusOutEvent=False
 
 
       for i in range(self.tailleTuple):
@@ -61,6 +62,8 @@ class TupleCustom(object) :
          courant.num=index
          courant.dansUnTuple=True
          courant.returnPressed.connect(self.valueChange)
+         courant.numDsLaListe = i+1
+         courant.tupleCustomParent=self
 
 
   def valueChange(self):
@@ -70,8 +73,9 @@ class TupleCustom(object) :
          nomLE="lineEditVal_"+str(i+1)
          courant=getattr(self,nomLE)
          val=str(courant.text())
+        
          if str(val)=="" or val==None : 
-            courant.setFocus()
+            if not self.inFocusOutEvent : courant.setFocus()
             return
          try :
              valeur=eval(val,{})

diff --git a/UiQT5/desWidgetVide.ui b/UiQT5/desWidgetVide.ui
index 03a815f7b055a78e2ba7cbe8afb1fd96c466a50d..8c0217bb088bd1648d6ff8609a51fd80ba9368bf 100644 (file)
--- a/UiQT5/desWidgetVide.ui
+++ b/UiQT5/desWidgetVide.ui
@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1069</width>
-    <height>55</height>
+    <height>60</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -33,13 +33,13 @@
     <number>0</number>
    </property>
    <property name="topMargin">
-    <number>2</number>
+    <number>8</number>
    </property>
    <property name="rightMargin">
     <number>0</number>
    </property>
    <property name="bottomMargin">
-    <number>0</number>
+    <number>8</number>
    </property>
    <item>
     <layout class="QHBoxLayout" name="horizontalLayout">