optim eciture

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

diff --git a/InterfaceQT4/compomacro.py b/InterfaceQT4/compomacro.py
index c5c282e2b2b44f6909379f3c2bb539e17fb4f82b..8324df2006e054e1b2bbb1a9feecd41fb7dde17c 100644 (file)
--- a/InterfaceQT4/compomacro.py
+++ b/InterfaceQT4/compomacro.py
@@ -19,30 +19,34 @@
 #
 
 # Modules Python
-import os,sys,string
+from __future__ import absolute_import
+import os,sys
 import types
 import traceback
 
 # Modules Eficas
 from Editeur import Objecttreeitem
 from Extensions.i18n import tr
-import compooper
-import browser
-import typeNode
-from PyQt4.QtGui import QAction
-from PyQt4.QtCore import Qt, SIGNAL, QVariant
+from . import compooper
+from . import browser
+from . import typeNode
+from PyQt5.QtWidgets import QAction
+from PyQt5.QtCore import Qt
+
 
 
 class MACRONode(browser.JDCNode,typeNode.PopUpMenuNode):         
-    def getPanel(self):
-      from   monMacroPanel import MonMacroPanel
-      return MonMacroPanel (self,parent=self.editor )
     
+    def getPanel(self):
+      from   .monWidgetCommande import MonWidgetCommande
+      return MonWidgetCommande (self,self.editor ,self.item.object)
+
+
     def createPopUpMenu(self):
       typeNode.PopUpMenuNode.createPopUpMenu(self)
       if ("AFFE_CARA_ELEM" in self.item.get_genealogie()) and self.editor.salome:
            self.ViewElt = QAction(tr('View3D'),self.tree)
-           self.tree.connect(self.ViewElt,SIGNAL("activated()"),self.view3D)
+           self.ViewElt.triggered.connect(self.view3D)
            self.ViewElt.setStatusTip(tr("affiche dans Geom les elements de structure"))
            self.menu.addAction(self.ViewElt)
            if self.item.isvalid() :
@@ -56,15 +60,9 @@ class MACRONode(browser.JDCNode,typeNode.PopUpMenuNode):
         troisD.envoievisu()
 
         
-    #def doPaste(self,node_selected):
-    #    print 'je suis la'
-    #    objetACopier = self.item.get_copie_objet()
-    #    child=self.append_brother(objetACopier)
-    #    return child
-
     
 class MACROTreeItem(compooper.EtapeTreeItem):
-#  """ Cette classe hérite d'une grande partie des comportements
+#  """ Cette classe herite d'une grande partie des comportements
 #      de la classe compooper.EtapeTreeItem
 #  """
     itemNode=MACRONode
@@ -83,9 +81,10 @@ class INCLUDETreeItemBase(MACROTreeItem):
 
 
 class INCLUDENode(browser.JDCNode,typeNode.PopUpMenuNode):    
+
     def getPanel(self):
-      from   monIncludePanel import MonIncludePanel
-      return MonIncludePanel (self,parent=self.editor )
+      from   .monWidgetCommande import MonWidgetCommande
+      return MonWidgetCommande (self,self.editor ,self.item.object)
 
     def createPopUpMenu(self):
       typeNode.PopUpMenuNode.createPopUpMenu(self)
@@ -110,13 +109,14 @@ class INCLUDETreeItem(INCLUDETreeItemBase):
     
 
 # ------------------------------------
-#  Classes necessaires à POURSUITE
+#  Classes necessaires a POURSUITE
 # ------------------------------------
     
 class POURSUITENode(browser.JDCNode, typeNode.PopUpMenuNode):    
+
     def getPanel(self):
-      from   monPoursuitePanel import MonPoursuitePanel
-      return MonPoursuitePanel (self,parent=self.editor )
+      from   .monWidgetCommande import MonWidgetCommande
+      return MonWidgetCommande (self,self.editor ,self.item.object)
 
     def createPopUpMenu(self):
       typeNode.PopUpMenuNode.createPopUpMenu(self)
@@ -147,8 +147,8 @@ class POURSUITETreeItem(INCLUDETreeItemBase):
 class MATERIAUNode(MACRONode):
 
     def getPanel(self):
-      from   monMacroPanel import MonMacroPanel
-      return MonMacroPanel (self,parent=self.editor )
+      from   .monWidgetCommande import MonWidgetCommande
+      return MonWidgetCommande (self,self.editor ,self.item.object)
 
     def createPopUpMenu(self):
       typeNode.PopUpMenuNode.createPopUpMenu(self)