From: Renaud Barate <renaud.barate@edf.fr>
Date: Tue, 19 Jul 2011 13:10:46 +0000 (+0000)
Subject: Merge from V6_3_BR
X-Git-Tag: mergefrom_V6_3_BR_19jul11
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=6af7da489e50078dc203006a5bf98aeb8f73a299;p=tools%2Feficas.git

Merge from V6_3_BR
---

diff --git a/InterfaceQT4/monFonctionPanel.py b/InterfaceQT4/monFonctionPanel.py
index 4d9f2c62..5c3558fb 100644
--- 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 b7ced50e..4a4f3073 100644
--- 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 d7ea43f8..1b0b5957 100644
--- 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