Merge from V6_3_BR

diff --git a/InterfaceQT4/monFonctionPanel.py b/InterfaceQT4/monFonctionPanel.py
index 4d9f2c62d8b1bf5787fa1c330cd0518d95e118db..5c3558fbf424ce8f6527f144e1910c94ce95e1e5 100644 (file)
--- a/InterfaceQT4/monFonctionPanel.py
+++ b/InterfaceQT4/monFonctionPanel.py
@@ -173,7 +173,9 @@ class MonFonctionPanel(MonPlusieursBasePanel):
   def Sup1Valeur(self):
         index=self.LBValeurs.currentRow()
         if index == None : return
-        self.LBValeurs.takeItem(index)
+        removed_item = self.LBValeurs.takeItem(index)
+        text = removed_item.text()[1:-1] # Remove the parenthesis
+        self.LEValeur.setText(text)
         listeVal=[]
         indexInterdit=[]
         for i in range(self.nbValeurs):

diff --git a/InterfaceQT4/monUniqueBasePanel.py b/InterfaceQT4/monUniqueBasePanel.py
index b7ced50e048b11c1dee5f456fbd347a9e0781d18..4a4f30734fa8acae8f491d83394a959d2b05b7d2 100644 (file)
--- a/InterfaceQT4/monUniqueBasePanel.py
+++ b/InterfaceQT4/monUniqueBasePanel.py
@@ -178,8 +178,8 @@ class MonUniqueBasePanel(DUnBase,QTPanel,SaisieValeur):
                self.connect(self.BSelectInFile,SIGNAL("clicked()"),self.BSelectInFilePressed)
              else :
                self.BSelectInFile.setVisible(1)
-         else:
-               self.BSelectInFile.setVisible(0)
+         elif hasattr(self, "BSelectInFile"):
+             self.BSelectInFile.setVisible(0)
 
           
   def BSelectInFilePressed(self):

diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index d7ea43f8c8766a8548f0c6cde27323bd66654a50..1b0b595741439c924fd2871ddbe864e9932dd252 100644 (file)
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -19,7 +19,7 @@ class Appli(Ui_Eficas,QMainWindow):
         """
         Constructor
         """
-        self.VERSION_EFICAS="Eficas QT4 V6.3.0"
+        self.VERSION_EFICAS="Eficas QT4 V6.3.1"
 
         self.ihm="QT"
         self.code=code