synchronisation avec Yoann

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

diff --git a/InterfaceQT4/compofact.py b/InterfaceQT4/compofact.py
index c5ee1cdde65eb5410341968a1f020edb064b7652..ce43add587f613a65170b53a5e4fa604c8041bed 100644 (file)
--- a/InterfaceQT4/compofact.py
+++ b/InterfaceQT4/compofact.py
@@ -18,15 +18,14 @@
 # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com
 #
 
-from PyQt4 import *
-from PyQt4.QtGui  import *
-from PyQt4.QtCore import *
-import browser
-import typeNode
+from __future__ import absolute_import
+from . import browser
+from . import typeNode
 from Extensions.i18n import tr
 
 
 from Editeur import Objecttreeitem
+import six
 
 
 class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel):
@@ -38,12 +37,16 @@ class Node(browser.JDCNode,typeNode.PopUpMenuNodePartiel):
         maCommande=commande
         if hasattr(parentQt,'niveau'): self.niveau=parentQt.niveau+1
         else : self.niveau=1
-        if  hasattr(self,'plie') :print self.item.nom, self.plie
+        #if  hasattr(self,'plie') :print self.item.nom, self.plie
+        #if maDefinition.sensLayout == 'horizontal':
+        #   from .monWidgetFact import MonWidgetFactHorizontal
+        #   widget=MonWidgetFactHorizontal(self,self.editor,parentQt,maDefinition,monObjet,self.niveau,maCommande)
+        #elif  hasattr(self,'plie') and self.plie==True : 
         if  hasattr(self,'plie') and self.plie==True : 
-           from monWidgetFactPlie import MonWidgetFactPlie
+           from .monWidgetFactPlie import MonWidgetFactPlie
            widget=MonWidgetFactPlie(self,self.editor,parentQt,maDefinition,monObjet,self.niveau,maCommande)
         else:
-           from monWidgetFact import MonWidgetFact
+           from .monWidgetFact import MonWidgetFact
            widget=MonWidgetFact(self,self.editor,parentQt,maDefinition,monObjet,self.niveau,maCommande)
         return widget
 
@@ -68,6 +71,7 @@ class FACTTreeItem(Objecttreeitem.ObjectTreeItem):
         - la couleur du texte
       """
       # None --> fonte et couleur par defaut
+      if not(hasattr(self.object,'getlabeltext')): return self.object.nom,None,None
       return self.object.getlabeltext(),None,None
 
   def isvalid(self):
@@ -84,9 +88,10 @@ class FACTTreeItem(Objecttreeitem.ObjectTreeItem):
     else:
       return "ast-yel-los"
 
-  def keys(self):
-    keys=self.object.mc_dict.keys()
-    return keys
+  #PNPN ????
+  #def keys(self):
+  #  keys=self.object.mc_dict
+  #  return keys
 
   def GetSubList(self):
       """
@@ -133,7 +138,7 @@ class FACTTreeItem(Objecttreeitem.ObjectTreeItem):
          return (0, tr('Impossible de supprimer un mot-cle obligatoire '))
 
       if self.object.suppentite(itemobject):
-         message = tr("Mot-cle %s supprime")+ unicode(itemobject.nom)
+         message = tr("Mot-cle %s supprime")+ six.text_type(itemobject.nom)
          #self.editor.affiche_commentaire(message)
          return (1, message)
       else: