X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2Fcompomacro.py;h=64a9d63ff240800dad49e09ed5c33a0ce5e6a42c;hb=5a28801efd8fd7e6487d1957dabac40b1f932cb4;hp=2bba03e8b1c1771ed8bf2a4d9a9f2caf82927c03;hpb=9e5ea0ed745d6d22d5ccd9c8dab56340c46809d9;p=tools%2Feficas.git diff --git a/InterfaceQT4/compomacro.py b/InterfaceQT4/compomacro.py index 2bba03e8..64a9d63f 100644 --- a/InterfaceQT4/compomacro.py +++ b/InterfaceQT4/compomacro.py @@ -1,5 +1,5 @@ # -*- 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,35 +19,37 @@ # # 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 InterfaceQT4 import compooper +from InterfaceQT4 import browser +from InterfaceQT4 import typeNode +from PyQt5.QtWidgets import QAction +from PyQt5.QtCore import Qt + class MACRONode(browser.JDCNode,typeNode.PopUpMenuNode): def getPanel(self): - from monWidgetCommande import MonWidgetCommande + 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: + if ("AFFE_CARA_ELEM" in self.item.getGenealogie()) and self.editor.salome: self.ViewElt = QAction(tr('View3D'),self.tree) - self.tree.connect(self.ViewElt,SIGNAL("triggered()"),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() : + if self.item.isValid() : self.ViewElt.setEnabled(1) else: self.ViewElt.setEnabled(0) @@ -58,10 +60,9 @@ class MACRONode(browser.JDCNode,typeNode.PopUpMenuNode): troisD.envoievisu() - 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 @@ -72,17 +73,17 @@ class MACROTreeItem(compooper.EtapeTreeItem): class INCLUDETreeItemBase(MACROTreeItem): - def __init__(self,appli, labeltext, object, setfunction): - MACROTreeItem.__init__(self,appli, labeltext, object, setfunction) + def __init__(self,appli, labeltext, object, setFunction): + MACROTreeItem.__init__(self,appli, labeltext, object, setFunction) - def iscopiable(self): + def isCopiable(self): return 0 class INCLUDENode(browser.JDCNode,typeNode.PopUpMenuNode): def getPanel(self): - from monWidgetCommande import MonWidgetCommande + from .monWidgetCommande import MonWidgetCommande return MonWidgetCommande (self,self.editor ,self.item.object) def createPopUpMenu(self): @@ -97,7 +98,7 @@ class INCLUDENode(browser.JDCNode,typeNode.PopUpMenuNode): if not hasattr(self.item.object,"jdc_aux") or self.item.object.jdc_aux is None: #L'include n'est pas initialise - self.item.object.build_include(None,"") + self.item.object.buildInclude(None,"") # On cree un nouvel onglet dans le bureau self.editor.vm.displayJDC( self.item.object.jdc_aux , self.item.object.jdc_aux.nom ) @@ -108,13 +109,13 @@ class INCLUDETreeItem(INCLUDETreeItemBase): # ------------------------------------ -# Classes necessaires à POURSUITE +# Classes necessaires a POURSUITE # ------------------------------------ class POURSUITENode(browser.JDCNode, typeNode.PopUpMenuNode): def getPanel(self): - from monWidgetCommande import MonWidgetCommande + from .monWidgetCommande import MonWidgetCommande return MonWidgetCommande (self,self.editor ,self.item.object) def createPopUpMenu(self): @@ -129,7 +130,7 @@ class POURSUITENode(browser.JDCNode, typeNode.PopUpMenuNode): if not hasattr(self.item.object,"jdc_aux") or self.item.object.jdc_aux is None: text="""DEBUT() FIN()""" - self.object.build_poursuite(None,text) + self.object.buildPoursuite(None,text) # On cree un nouvel onglet dans le bureau self.editor.vm.displayJDC( self.item.object.jdc_aux , self.item.object.jdc_aux.nom) @@ -146,7 +147,7 @@ class POURSUITETreeItem(INCLUDETreeItemBase): class MATERIAUNode(MACRONode): def getPanel(self): - from monWidgetCommande import MonWidgetCommande + from .monWidgetCommande import MonWidgetCommande return MonWidgetCommande (self,self.editor ,self.item.object) def createPopUpMenu(self): @@ -173,18 +174,18 @@ class INCLUDE_MATERIAUTreeItem(INCLUDETreeItemBase): # ------------------------------------ -def treeitem(appli, labeltext, object, setfunction=None): +def treeitem(appli, labeltext, object, setFunction=None): """ Factory qui retourne l'item adapte au type de macro : INCLUDE, POURSUITE, MACRO """ if object.nom == "INCLUDE_MATERIAU": - return INCLUDE_MATERIAUTreeItem(appli, labeltext, object, setfunction) + return INCLUDE_MATERIAUTreeItem(appli, labeltext, object, setFunction) elif object.nom == "INCLUDE" or object.nom== "DICTDATA": - return INCLUDETreeItem(appli, labeltext, object, setfunction) + return INCLUDETreeItem(appli, labeltext, object, setFunction) elif object.nom == "POURSUITE": - return POURSUITETreeItem(appli, labeltext, object, setfunction) + return POURSUITETreeItem(appli, labeltext, object, setFunction) else: - return MACROTreeItem(appli, labeltext, object, setfunction) + return MACROTreeItem(appli, labeltext, object, setFunction) import Accas objet=Accas.MACRO_ETAPE