From: pascale.noyret <pascale.noyret@edf.fr>
Date: Wed, 30 Nov 2016 16:41:36 +0000 (+0100)
Subject: bugsss
X-Git-Tag: Salome_8_3_Hydro_2_0rc1~110
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=d6c11f43b5e70184284a0e2c9fc6ac63ac768e1c;p=modules%2Feficas.git

bugsss
---

diff --git a/InterfaceQT4/gereIcones.py b/InterfaceQT4/gereIcones.py
index fd4bc330..599b3a8d 100644
--- a/InterfaceQT4/gereIcones.py
+++ b/InterfaceQT4/gereIcones.py
@@ -22,7 +22,7 @@ import string,types,os,re,sys
 import traceback
 from  determine import monEnvQT5
 if monEnvQT5 :
-  from PyQt5.QtWidgets import QMessageBox, QFileDialog , QMenu
+  from PyQt5.QtWidgets import QMessageBox, QFileDialog , QMenu, QPushButton
   from PyQt5.QtGui import QIcon
   from PyQt5.QtCore import  QFileInfo,  Qt, QSize, QVariant
 
@@ -290,15 +290,19 @@ class ContientIcones:
          if (QFileInfo(fichier).suffix() in listeSuffixe ):
              self.image=fichier
              if (not hasattr(self,"BSelectInFile")):
-               self.BSelectInFile = QPushButton(self.Widget8)
-               self.BSelectInFile.setMinimumSize(QSize(140,40))
-               self.BSelectInFile.setObjectName("BSelectInFile")
-               self.gridLayout.addWidget(self.BSelectInFile,1,1,1,1)
-               self.BSelectInFile.setText(tr("Selection"))
-               if monEnvQT5 : self.BSelectInFile.clicked.connect(self.BSelectInFilePressed)
-               else : self.connect(self.BSelectInFile,SIGNAL("clicked()"),self.BSelectInFilePressed)
+               try :
+                 self.BSelectInFile = QPushButton(self)
+                 self.BSelectInFile.setMinimumSize(QSize(140,40))
+                 self.BSelectInFile.setObjectName("BSelectInFile")
+                 self.gridLayout.addWidget(self.BSelectInFile,1,1,1,1)
+                 self.BSelectInFile.setText(tr("Selection"))
+                 if monEnvQT5 : self.BSelectInFile.clicked.connect(self.BSelectInFilePressed)
+                 else : self.connect(self.BSelectInFile,SIGNAL("clicked()"),self.BSelectInFilePressed)
+               except :
+                pass
              else :
                self.BSelectInFile.setVisible(1)
+               
          elif hasattr(self, "BSelectInFile"):
              self.BSelectInFile.setVisible(0)
 
diff --git a/InterfaceQT4/monWidgetPlusieursInto.py b/InterfaceQT4/monWidgetPlusieursInto.py
index 8afddf0c..7c9088c2 100644
--- a/InterfaceQT4/monWidgetPlusieursInto.py
+++ b/InterfaceQT4/monWidgetPlusieursInto.py
@@ -73,7 +73,7 @@ class MonWidgetPlusieursInto (Ui_WidgetPlusieursInto,Feuille,GerePlie,GereListe)
             spacerItem2 = QSpacerItem(40, 70, QSizePolicy.Fixed, QSizePolicy.Minimum)
             self.CBLayout.addItem(spacerItem2)
 
-        if len(self.listeAAfficher) < 25 : self.frameRecherche.close()
+        if len(self.listeAAfficher) < 30 and hasattr(self,'frameRecherche') : self.frameRecherche.close()
         # try except si la liste des possibles est vide
         # prevoir qqchose
         try :
diff --git a/InterfaceQT4/monWidgetSimpTuple.py b/InterfaceQT4/monWidgetSimpTuple.py
index 8c259af5..df97fa43 100644
--- a/InterfaceQT4/monWidgetSimpTuple.py
+++ b/InterfaceQT4/monWidgetSimpTuple.py
@@ -84,7 +84,13 @@ class MonWidgetSimpTuple(Feuille):
 
       # Passage au champ suivant
       nom=aLeFocus.objectName()[11:]
-      i=nom.toInt()[0]+1
+      try :
+        i=str(nom).toInt()[0]+1
+      except :
+        try :
+          i=i+1
+        except :
+          return
       if i == self.nbValeurs +1 : i=1
       nomLineEdit="lineEditVal"+str(i)
       courant=getattr(self,nomLineEdit)
diff --git a/InterfaceQT4/monWidgetSimpTuple3.py b/InterfaceQT4/monWidgetSimpTuple3.py
index 051102ec..fe0ffe45 100644
--- a/InterfaceQT4/monWidgetSimpTuple3.py
+++ b/InterfaceQT4/monWidgetSimpTuple3.py
@@ -21,8 +21,8 @@
 import string,types,os
 
 # Modules Eficas
-from PyQt4.QtGui import *
-from PyQt4.QtCore import *
+#from PyQt4.QtGui import *
+#from PyQt4.QtCore import *
 from Extensions.i18n import tr
 
 from feuille               import Feuille