Merge V9 dans Master

[tools/eficas.git] / InterfaceQT4 / monBoutonValide.py

diff --git a/InterfaceQT4/monBoutonValide.py b/InterfaceQT4/monBoutonValide.py
index 504184349206067e4c5530e88b1a19b1f81e758f..335d164453743f3294e8b4fc936b87d62775db18 100644 (file)
--- a/InterfaceQT4/monBoutonValide.py
+++ b/InterfaceQT4/monBoutonValide.py
@@ -1,6 +1,6 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
-# Copyright (C) 2007-2013   EDF R&D
+# Copyright (C) 2007-2017   EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -19,13 +19,14 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
+from __future__ import absolute_import
 import re
-from determine import monEnvQT5
-if monEnvQT5:
-   from PyQt5.QtWidgets import QToolButton, QToolTip
-else :
-   from PyQt4.QtGui import *
-   from PyQt4.QtCore import *
+import six
+
+import os
+
+
+from PyQt5.QtWidgets import QToolButton, QToolTip
 from Extensions.i18n import tr
 
 class MonBoutonValide(QToolButton) :
@@ -38,17 +39,25 @@ class MonBoutonValide(QToolButton) :
 
      def mouseDoubleClickEvent(self, event):
         #print "dans mouseDoubleClickEvent"
-        strRapport=unicode(self.parent.node.item.object.report())
-        self.parent.editor._viewText(strRapport, "JDC_RAPPORT")
+        strAide=self.parent.node.item.object.getFr()
+        if hasattr(self.parent.node.item.object.definition, 'defaut') :
+                strAide+='\ndefaut : \n'+str(self.parent.node.item.object.definition.defaut)
+        strRapport=six.text_type(self.parent.node.item.object.report())
+        self.parent.editor._viewText(strAide+"\n"+strRapport, "JDC_RAPPORT")
 
      def mousePressEvent(self, event):
        #print "dans mousePressEvent"
-       if self.parent.node.item.object.isvalid() :
+       if self.parent.node.item.object.isValid() :
           myToolTip=tr("objet valide")
+          if self.parent.editor.maConfiguration.differencieSiDefaut :
+            if hasattr(self.parent.node.item.object.definition, 'defaut') :
+              if self.parent.node.item.object.valeur != self.parent.node.item.object.definition.defaut :
+                myToolTip+='\ndefaut : \n'+str(self.parent.node.item.object.definition.defaut)
+
           QToolTip.showText(event.globalPos(),myToolTip )
        else :
           t=""
-          texte=unicode(self.parent.node.item.object.report())
+          texte=six.text_type(self.parent.node.item.object.report())
           deb=1
           for l in texte.split('\n')[2:-2]:
               if re.match('^[\t !]*$',l) : continue