From: pascale.noyret <pascale.noyret@edf.fr>
Date: Mon, 15 Oct 2018 15:25:06 +0000 (+0200)
Subject: divers bugs Sophie
X-Git-Tag: HYDRO_V2_0_0~1
X-Git-Url: http://git.salome-platform.org/gitweb/?a=commitdiff_plain;h=9371497a70ea0417be3f7181f6b662d430ae8501;p=tools%2Feficas.git

divers bugs Sophie
---

diff --git a/Editeur/Objecttreeitem.py b/Editeur/Objecttreeitem.py
index cfb4f264..e2755144 100644
--- a/Editeur/Objecttreeitem.py
+++ b/Editeur/Objecttreeitem.py
@@ -401,10 +401,6 @@ class ObjectTreeItem(TreeItem,Delegate):
             self.setFunction(value)
         except:
             pass
-# Modif de ma part CCar : je ne comprend pas a quoi ca sert
-# ca parait meme incorrect
-      #  else:
-      #      self.object = value
 
     def isExpandable(self):
         return 1
diff --git a/InterfaceQT4/browser.py b/InterfaceQT4/browser.py
index 088f6ab0..deb58df3 100644
--- a/InterfaceQT4/browser.py
+++ b/InterfaceQT4/browser.py
@@ -81,8 +81,8 @@ class JDCTree( QTreeWidget,GereRegles ):
         #print ("self.editor.maConfiguration.afficheCommandesPliees", self.editor.maConfiguration.afficheCommandesPliees)
         if self.racine.children !=[] :  
            #self.editor.initSplitterSizes(3)
-           if self.editor.maConfiguration.afficheCommandesPliees : self.racine.children[0].plieToutEtReaffiche()
-           else : self.racine.children[0].deplieToutEtReaffiche()
+           if self.editor.maConfiguration.afficheCommandesPliees :  self.racine.children[0].plieToutEtReaffiche()
+           else :  self.racine.children[0].deplieToutEtReaffiche()
            self.racine.children[0].fenetre.donnePremier()
         else : 
           #self.editor.initSplitterSizes(2)
@@ -234,7 +234,9 @@ class JDCNode(QTreeWidgetItem,GereRegles):
         elif (isinstance(self.item,compoparam.PARAMTreeItem)) : name=tr(str(item.getLabelText()[0]))
         #else:   name  = tr(str(tr(item.getLabelText()[0]))+" :")
         else:   name  = tr(item.getLabelText()[0])
+        #else : name = str(tr(item.nom)+" :")
         if item.nom != tr(item.nom) : name = str(tr(item.nom)+" :")
+        
         value = tr(str( item.getText() ) )
        
         # si specialisation de la fenetre
@@ -398,6 +400,7 @@ class JDCNode(QTreeWidgetItem,GereRegles):
               return
            self.fenetre=self.getPanelModifie()
            if self.fenetre == None : self.fenetre=self.getPanel()
+
            self.editor.restoreSplitterSizes()
          
         for indiceWidget in range(self.editor.widgetCentraleLayout.count()):
@@ -732,6 +735,7 @@ class JDCNode(QTreeWidgetItem,GereRegles):
         """ Met a jour le label du noeud """
         #print ("NODE updateNodeLabel", self.item.getLabelText())
         labeltext,fonte,couleur = self.item.getLabelText()
+        if item.nom != tr(item.nom) : labeltext = str(tr(item.nom)+" :")
         # PNPN a reflechir
         self.setText(0, tr(labeltext))    
     
@@ -744,6 +748,7 @@ class JDCNode(QTreeWidgetItem,GereRegles):
         if hasattr(self.appliEficas,'noeudColore'): self.appliEficas.noeudColore.setForeground(0,Qt.black)
         self.setForeground(0,Qt.blue)
         labeltext,fonte,couleur = self.item.getLabelText()
+        if item.nom != tr(item.nom) : labeltext = str(tr(item.nom)+" :")
         self.setText(0, labeltext)        
         self.appliEficas.noeudColore=self
 
@@ -755,7 +760,7 @@ class JDCNode(QTreeWidgetItem,GereRegles):
         self.appliEficas.listeNoeudsColores=[]
         for noeud in liste :
             noeud.setTextColor( 0,Qt.blue )
-            labeltext,fonte,couleur = noeud.item.getLabelText()
+            if item.nom != tr(item.nom) : labeltext = str(tr(item.nom)+" :")
             noeud.setText(0, labeltext)        
             self.appliEficas.listeNoeudsColores.append(noeud)
 
@@ -928,7 +933,7 @@ class JDCNode(QTreeWidgetItem,GereRegles):
 
 
     def setDeplie(self):
-        #print "dans setPlieChildren pour", self.item.nom
+        #print ("dans setPlieChildren pour", self.item.nom)
         #print "je mets inhibeExpand a true dans setDeplie"
         self.tree.inhibeExpand=True
         self.plie=False
diff --git a/InterfaceQT4/feuille.py b/InterfaceQT4/feuille.py
index d3800d89..ee00182d 100644
--- a/InterfaceQT4/feuille.py
+++ b/InterfaceQT4/feuille.py
@@ -174,6 +174,8 @@ class Feuille(QWidget,ContientIcones,SaisieValeur,FacultatifOuOptionnel):
             #c=str('<html><head/><body><p><span style=" font-size:8pt; ">')+c+"</span></p></body></html>"
             c=str('<html><head/><body><p>')+c+"</p></body></html>"
             self.label.setToolTip(c)
+      if self.editor.maConfiguration.differencieSiDefaut :
+            self.label.setToolTip('defaut : ' + tr(str(self.node.item.object.definition.defaut)))
 
 
 
diff --git a/InterfaceQT4/monWidgetPlusieursBase.py b/InterfaceQT4/monWidgetPlusieursBase.py
index c4998000..486ae7d5 100644
--- a/InterfaceQT4/monWidgetPlusieursBase.py
+++ b/InterfaceQT4/monWidgetPlusieursBase.py
@@ -29,7 +29,7 @@ import types,os,sys
 
 from six.moves import range
 from PyQt5.QtGui     import QIcon 
-from PyQt5.QtWidgets import QApplication, QMessageBox
+from PyQt5.QtWidgets import QApplication, QMessageBox, QScrollArea
 from PyQt5.QtCore    import QTimer, QSize, Qt
 
 # Modules Eficas
@@ -97,6 +97,7 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie)
         self.inInit=False
         # PNPN a completer __ si tuple le type des tuples sinon le tuple
         self.monCommentaireLabel.setText(self.finCommentaireListe())
+        self.scrollArea.leaveEvent = self.leaveEventScrollArea
 
 
   def setValeurs(self):
@@ -289,12 +290,14 @@ class MonWidgetPlusieursBase (Ui_WidgetPlusieursBase,Feuille,GereListe,GerePlie)
         self.editor.afficheInfos(tr('nb min de valeurs : ')+str( self.monSimpDef.min))
       if len(self.listeValeursCourantes) < min and oblige==True: return
       if len(self.listeValeursCourantes) > max : return
-      self.node.item.setValeur(self.listeValeursCourantes)
+      retour=self.node.item.setValeur(self.listeValeursCourantes)
       if len(self.listeValeursCourantes) == self.monSimpDef.max  :
         self.editor.afficheInfos(tr('nb max de valeurs atteint'))
       self.setValide()
       self.reaffiche()
 
-          
+  def leaveEventScrollArea(self,event):
+       self.changeValeur(changeDePlace=False)
+       QScrollArea.leaveEvent(self.scrollArea,event)
 
 # Avertissement quand on quitte le widget
diff --git a/InterfaceQT4/qtEficas.py b/InterfaceQT4/qtEficas.py
index c5eb945f..057942a0 100755
--- a/InterfaceQT4/qtEficas.py
+++ b/InterfaceQT4/qtEficas.py
@@ -379,6 +379,15 @@ class Appli(AppliSsIhm,Ui_Eficas,QMainWindow):
         self.menuOptions.addAction(self.actionParametres_Eficas)
         self.menuOptions.setTitle(tr("Options"))
 
+    def MAPIDENTIFICATION(self):
+        self.enlevernewInclude()
+        self.enleverSupprimer()
+        #self.ajoutExecution()
+        self.enleverRechercherDsCatalogue()
+        self.enleverActionsStructures()
+        self.enleverParametres()
+
+
     def PSEN(self):
         if self.first:  self.first=0
         try : self.action_Nouveau.triggered.disconnect(self.fileNew)