From 00ab1969dfae984bb368ad07f709b05aabd671a5 Mon Sep 17 00:00:00 2001 From: PASCALE NOYRET Date: Mon, 11 Dec 2023 23:43:28 +0100 Subject: [PATCH] chgt des imports --- InterfaceGUI/QT5/browser.py | 12 +++++----- InterfaceGUI/QT5/compobloc.py | 8 +++---- InterfaceGUI/QT5/compocomm.py | 6 ++--- InterfaceGUI/QT5/compocommandecomm.py | 2 +- InterfaceGUI/QT5/compofact.py | 6 ++--- InterfaceGUI/QT5/compoformule.py | 8 +++---- InterfaceGUI/QT5/compojdc.py | 6 ++--- InterfaceGUI/QT5/compomacro.py | 12 +++++----- InterfaceGUI/QT5/compomclist.py | 6 ++--- InterfaceGUI/QT5/compooper.py | 9 ++++--- InterfaceGUI/QT5/compoparam.py | 6 ++--- InterfaceGUI/QT5/compoproc.py | 8 +++---- InterfaceGUI/QT5/composimp.py | 2 +- InterfaceGUI/QT5/editor.py | 12 +++++----- InterfaceGUI/QT5/feuille.py | 6 ++--- InterfaceGUI/QT5/gereIcones.py | 10 ++++---- InterfaceGUI/QT5/gereListe.py | 2 +- InterfaceGUI/QT5/gereListeAvril11.py | 2 +- InterfaceGUI/QT5/gereTraduction.py | 2 +- InterfaceGUI/QT5/groupe.py | 4 ++-- InterfaceGUI/QT5/monChoixCata.py | 2 +- InterfaceGUI/QT5/monChoixCode.py | 2 +- InterfaceGUI/QT5/monChoixCommande.py | 2 +- InterfaceGUI/QT5/monChoixLangue.py | 2 +- InterfaceGUI/QT5/monFonctionPanel.py | 4 ++-- InterfaceGUI/QT5/monGroupeOptionnel.py | 4 ++-- InterfaceGUI/QT5/monRecherche.py | 2 +- InterfaceGUI/QT5/monRechercheCatalogue.py | 2 +- InterfaceGUI/QT5/monSelectVal.py | 2 +- InterfaceGUI/QT5/monViewRegles.py | 2 +- InterfaceGUI/QT5/monViewTexte.py | 2 +- InterfaceGUI/QT5/monVisu.py | 2 +- InterfaceGUI/QT5/monWidget4a6RadioButton.py | 4 ++-- InterfaceGUI/QT5/monWidget4a6RadioButtonSD.py | 4 ++-- InterfaceGUI/QT5/monWidgetBloc.py | 4 ++-- InterfaceGUI/QT5/monWidgetCB.py | 2 +- InterfaceGUI/QT5/monWidgetCBIntoSug.py | 12 +++++----- InterfaceGUI/QT5/monWidgetCBSD.py | 8 +++---- InterfaceGUI/QT5/monWidgetCommande.py | 10 ++++---- InterfaceGUI/QT5/monWidgetCommentaire.py | 2 +- InterfaceGUI/QT5/monWidgetCreeParam.py | 4 ++-- InterfaceGUI/QT5/monWidgetCreeUserAssd.py | 4 ++-- InterfaceGUI/QT5/monWidgetDate.py | 6 ++--- InterfaceGUI/QT5/monWidgetFact.py | 6 ++--- InterfaceGUI/QT5/monWidgetFactPlie.py | 4 ++-- InterfaceGUI/QT5/monWidgetFormule.py | 4 ++-- InterfaceGUI/QT5/monWidgetHeure.py | 6 ++--- InterfaceGUI/QT5/monWidgetInactif.py | 4 ++-- InterfaceGUI/QT5/monWidgetInfo.py | 2 +- InterfaceGUI/QT5/monWidgetIntoSug.py | 4 ++-- InterfaceGUI/QT5/monWidgetMatrice.py | 4 ++-- InterfaceGUI/QT5/monWidgetNiveauFact.py | 2 +- InterfaceGUI/QT5/monWidgetOptionnel.py | 4 ++-- InterfaceGUI/QT5/monWidgetParam.py | 4 ++-- .../QT5/monWidgetPlusieursASSDIntoOrdonne.py | 5 ++-- InterfaceGUI/QT5/monWidgetPlusieursBase.py | 2 +- .../QT5/monWidgetPlusieursCreeUserAssd.py | 4 ++-- InterfaceGUI/QT5/monWidgetPlusieursInto.py | 2 +- .../QT5/monWidgetPlusieursIntoOrdonne.py | 16 ++++++------- InterfaceGUI/QT5/monWidgetPlusieursPlie.py | 8 +++---- InterfaceGUI/QT5/monWidgetPlusieursTuple.py | 19 +++++++-------- InterfaceGUI/QT5/monWidgetPlusieursTupleN.py | 6 ++--- InterfaceGUI/QT5/monWidgetRadioButton.py | 8 +++---- InterfaceGUI/QT5/monWidgetSDCOInto.py | 8 +++---- InterfaceGUI/QT5/monWidgetSimpBase.py | 10 ++++---- InterfaceGUI/QT5/monWidgetSimpBool.py | 8 +++---- InterfaceGUI/QT5/monWidgetSimpComplexe.py | 8 +++---- InterfaceGUI/QT5/monWidgetSimpFichier.py | 4 ++-- InterfaceGUI/QT5/monWidgetSimpSalome.py | 8 +++---- InterfaceGUI/QT5/monWidgetSimpTupleN.py | 21 ++++++++-------- InterfaceGUI/QT5/monWidgetSimpTxt.py | 4 ++-- InterfaceGUI/QT5/monWidgetTableau.py | 4 ++-- InterfaceGUI/QT5/monWidgetUniqueSDCO.py | 11 ++++----- InterfaceGUI/QT5/monWidgetVide.py | 4 ++-- InterfaceGUI/QT5/qtEficas.py | 24 +++++++------------ InterfaceGUI/QT5/ssIhm.py | 5 +--- InterfaceGUI/QT5/typeNode.py | 4 ---- InterfaceGUI/QT5/viewManager.py | 6 ----- 78 files changed, 216 insertions(+), 244 deletions(-) diff --git a/InterfaceGUI/QT5/browser.py b/InterfaceGUI/QT5/browser.py index fba2d783..694e1103 100644 --- a/InterfaceGUI/QT5/browser.py +++ b/InterfaceGUI/QT5/browser.py @@ -21,7 +21,7 @@ import re import types, sys, os import traceback -from . import typeNode +from InterfaceGUI.QT5 import typeNode from PyQt5.QtWidgets import QTreeWidget, QTreeWidgetItem, QApplication, QMessageBox @@ -29,8 +29,8 @@ from PyQt5.QtGui import QIcon from PyQt5.QtCore import Qt from Extensions.i18n import tr -from .gereRegles import GereRegles -from .monChoixCommande import MonChoixCommande +from InterfaceGUI.QT5.gereRegles import GereRegles +from InterfaceGUI.QT5.monChoixCommande import MonChoixCommande # ------------------------------------------ @@ -407,7 +407,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): self.editor.fenetreCentraleAffichee.close() self.editor.fenetreCentraleAffichee.deleteLater() - from monWidgetNiveauFact import MonWidgetNiveauFact, MonWidgetNiveauFactTableau + from InterfaceGUI.QT5.monWidgetNiveauFact import MonWidgetNiveauFact, MonWidgetNiveauFactTableau maDefinition = self.item.get_definition() monObjet = self.item.object @@ -444,7 +444,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): # print ('_________________ds affichePanneau pour', self.item.nom) # pour l instant pas d inactif if not (self.item.isActif()): - from .monWidgetInactif import MonWidgetInactif + from InterfaceGUI.QT5.monWidgetInactif import MonWidgetInactif self.fenetre = MonWidgetInactif(self, self.editor) else: @@ -1068,7 +1068,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): # ----------------- # print "je mets inhibeExpand a true dans setPlie" # print ("je suis dans plieTout", self.item.getNom()) - from . import compojdc + from InterfaceGUI.QT5 import compojdc if self.fenetre == self.editor.fenetreCentraleAffichee and isinstance( self.treeParent, compojdc.Node diff --git a/InterfaceGUI/QT5/compobloc.py b/InterfaceGUI/QT5/compobloc.py index b3cc9313..ef27814c 100644 --- a/InterfaceGUI/QT5/compobloc.py +++ b/InterfaceGUI/QT5/compobloc.py @@ -20,9 +20,9 @@ from Editeur import Objecttreeitem -from . import compofact -from . import browser -from . import typeNode +from InterfaceGUI.QT5 import compofact +from InterfaceGUI.QT5 import browser +from InterfaceGUI.QT5 import typeNode class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): @@ -38,7 +38,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): self.niveau = parentQt.niveau + 1 else: self.niveau = 1 - from .monWidgetBloc import MonWidgetBloc + from InterfaceGUI.QT5.monWidgetBloc import MonWidgetBloc widget = MonWidgetBloc( self, self.editor, parentQt, maDefinition, monObjet, self.niveau, maCommande diff --git a/InterfaceGUI/QT5/compocomm.py b/InterfaceGUI/QT5/compocomm.py index 635d176f..928352f1 100644 --- a/InterfaceGUI/QT5/compocomm.py +++ b/InterfaceGUI/QT5/compocomm.py @@ -18,8 +18,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # from Editeur import Objecttreeitem -from . import browser -from . import typeNode +from InterfaceGUI.QT5 import browser +from InterfaceGUI.QT5 import typeNode from Extensions.i18n import tr from Extensions.eficas_exception import EficasException @@ -27,7 +27,7 @@ from Extensions.eficas_exception import EficasException class Node(browser.JDCNode, typeNode.PopUpMenuNodePartiel): def getPanel(self): """ """ - from .monWidgetCommentaire import MonWidgetCommentaire + from InterfaceGUI.QT5.monWidgetCommentaire import MonWidgetCommentaire return MonWidgetCommentaire(self, self.editor, self.item.object) diff --git a/InterfaceGUI/QT5/compocommandecomm.py b/InterfaceGUI/QT5/compocommandecomm.py index 88f9338b..ccadc0ca 100644 --- a/InterfaceGUI/QT5/compocommandecomm.py +++ b/InterfaceGUI/QT5/compocommandecomm.py @@ -22,7 +22,7 @@ import traceback from Editeur import Objecttreeitem from Extensions.eficas_exception import EficasException -from . import compocomm +from InterfaceGUI.QT5 import compocomm class COMMANDE_COMMTreeItem(Objecttreeitem.ObjectTreeItem): diff --git a/InterfaceGUI/QT5/compofact.py b/InterfaceGUI/QT5/compofact.py index 9a475095..1c3fd83d 100644 --- a/InterfaceGUI/QT5/compofact.py +++ b/InterfaceGUI/QT5/compofact.py @@ -38,7 +38,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodePartiel): else: self.niveau = 1 if hasattr(self, "plie") and self.plie == True: - from InterfaceGUI.QT5.monWidgetFactPlie import MonWidgetFactPlie + from InterfaceGUI.QT5.nterfaceGUI.QT5.monWidgetFactPlie import MonWidgetFactPlie widget = MonWidgetFactPlie( self, @@ -52,7 +52,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodePartiel): elif self.editor.maConfiguration.afficheFirstPlies and self.firstAffiche: self.firstAffiche = False self.setPlie() - from InterfaceGUI.QT5.monWidgetFactPlie import MonWidgetFactPlie + from InterfaceGUI.QT5.nterfaceGUI.QT5.monWidgetFactPlie import MonWidgetFactPlie widget = MonWidgetFactPlie( self, @@ -64,7 +64,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodePartiel): maCommande, ) else: - from InterfaceGUI.QT5.monWidgetFact import MonWidgetFact + from InterfaceGUI.QT5.nterfaceGUI.QT5.monWidgetFact import MonWidgetFact widget = MonWidgetFact( self, diff --git a/InterfaceGUI/QT5/compoformule.py b/InterfaceGUI/QT5/compoformule.py index f14e78b8..fcd50627 100644 --- a/InterfaceGUI/QT5/compoformule.py +++ b/InterfaceGUI/QT5/compoformule.py @@ -24,14 +24,14 @@ representant un objet de type FORMULE, cad le panneau et l'item de l'arbre d'EFICAS """ -from . import compooper -from . import browser -from . import typeNode +from InterfaceGUI.QT5 import compooper +from InterfaceGUI.QT5 import browser +from InterfaceGUI.QT5 import typeNode class FormuleNode(browser.JDCNode, typeNode.PopUpMenuNode): def getPanel(self): - from .monWidgetFormule import MonWidgetFormule + from InterfaceGUI.QT5.monWidgetFormule import MonWidgetFormule return MonWidgetFormule(self, self.editor, self.item.object) diff --git a/InterfaceGUI/QT5/compojdc.py b/InterfaceGUI/QT5/compojdc.py index 2d16f1a8..a1f2acaf 100644 --- a/InterfaceGUI/QT5/compojdc.py +++ b/InterfaceGUI/QT5/compojdc.py @@ -19,14 +19,14 @@ # from Editeur import Objecttreeitem -from . import browser -from . import typeNode +from InterfaceGUI.QT5 import browser +from InterfaceGUI.QT5 import typeNode from Extensions.i18n import tr class Node(browser.JDCNode, typeNode.PopUpMenuRacine): def getPanel(self): - from .monChoixCommande import MonChoixCommande + from InterfaceGUI.QT5.monChoixCommande import MonChoixCommande return MonChoixCommande(self, self.item, self.editor) def createPopUpMenu(self): diff --git a/InterfaceGUI/QT5/compomacro.py b/InterfaceGUI/QT5/compomacro.py index 5a4e8b3d..31734483 100644 --- a/InterfaceGUI/QT5/compomacro.py +++ b/InterfaceGUI/QT5/compomacro.py @@ -34,7 +34,7 @@ from InterfaceGUI.QT5 import typeNode class MACRONode(browser.JDCNode, typeNode.PopUpMenuNode): def getPanel(self): - from .monWidgetCommande import MonWidgetCommande + from InterfaceGUI.QT5.monWidgetCommande import MonWidgetCommande return MonWidgetCommande(self, self.editor, self.item.object) @@ -43,7 +43,7 @@ class MACRONode(browser.JDCNode, typeNode.PopUpMenuNode): # def view3D(self) : -# from Editeur import TroisDPal +# from InterfaceGUI.QT5.Editeur import TroisDPal # troisD=TroisDPal.TroisDPilote(self.item,self.editor.appliEficas) # troisD.envoievisu() @@ -70,7 +70,7 @@ class INCLUDETreeItemBase(MACROTreeItem): class INCLUDENode(browser.JDCNode, typeNode.PopUpMenuNode): def getPanel(self): - from .monWidgetCommande import MonWidgetCommande + from InterfaceGUI.QT5.monWidgetCommande import MonWidgetCommande return MonWidgetCommande(self, self.editor, self.item.object) @@ -107,7 +107,7 @@ class INCLUDETreeItem(INCLUDETreeItemBase): class POURSUITENode(browser.JDCNode, typeNode.PopUpMenuNode): def getPanel(self): - from .monWidgetCommande import MonWidgetCommande + from InterfaceGUI.QT5.monWidgetCommande import MonWidgetCommande return MonWidgetCommande(self, self.editor, self.item.object) @@ -144,7 +144,7 @@ class POURSUITETreeItem(INCLUDETreeItemBase): class MATERIAUNode(MACRONode): def getPanel(self): - from .monWidgetCommande import MonWidgetCommande + from InterfaceGUI.QT5.monWidgetCommande import MonWidgetCommande return MonWidgetCommande(self, self.editor, self.item.object) @@ -165,7 +165,7 @@ class MATERIAUNode(MACRONode): f = open(self.item.object.fichier_ini, "rb") texte = f.read() f.close() - from desVisu import DVisu + from InterfaceGUI.QT5.desVisu import DVisu monVisuDialg = DVisu(parent=self.editor.appliEficas, fl=0) monVisuDialg.TB.setText(texte) diff --git a/InterfaceGUI/QT5/compomclist.py b/InterfaceGUI/QT5/compomclist.py index fb80c100..91f11940 100644 --- a/InterfaceGUI/QT5/compomclist.py +++ b/InterfaceGUI/QT5/compomclist.py @@ -22,9 +22,9 @@ import types import traceback -from . import compofact -from . import browser -from . import typeNode +from InterfaceGUI.QT5 import compofact +from InterfaceGUI.QT5 import browser +from InterfaceGUI.QT5 import typeNode from Extensions.i18n import tr from Editeur import Objecttreeitem diff --git a/InterfaceGUI/QT5/compooper.py b/InterfaceGUI/QT5/compooper.py index 009cbf6a..8abc01d4 100644 --- a/InterfaceGUI/QT5/compooper.py +++ b/InterfaceGUI/QT5/compooper.py @@ -17,7 +17,6 @@ # # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from builtins import str import os import tempfile @@ -25,8 +24,8 @@ from Extensions.i18n import tr from Extensions.eficas_exception import EficasException from Editeur import Objecttreeitem -from . import browser -from . import typeNode +from InterfaceGUI.QT5 import browser +from InterfaceGUI.QT5 import typeNode class Node(browser.JDCNode, typeNode.PopUpMenuNode): @@ -56,7 +55,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNode): pass def getPanel(self): - from .monWidgetCommande import MonWidgetCommande + from InterfaceGUI.QT5.monWidgetCommande import MonWidgetCommande return MonWidgetCommande(self, self.editor, self.item.object) @@ -65,7 +64,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNode): # def view3D(self) : -# from Editeur import TroisDPal +# from InterfaceGUI.QT5.Editeur import TroisDPal # troisD=TroisDPal.TroisDPilote(self.item,self.editor.appliEficas) # troisD.envoievisu() diff --git a/InterfaceGUI/QT5/compoparam.py b/InterfaceGUI/QT5/compoparam.py index 39a3cb60..fbf0e3fb 100644 --- a/InterfaceGUI/QT5/compoparam.py +++ b/InterfaceGUI/QT5/compoparam.py @@ -28,14 +28,14 @@ from Extensions.i18n import tr # import modules EFICAS from Editeur import Objecttreeitem -from . import browser -from . import typeNode +from InterfaceGUI.QT5 import browser +from InterfaceGUI.QT5 import typeNode class Node(browser.JDCNode, typeNode.PopUpMenuNodePartiel): def getPanel(self): """ """ - from .monWidgetParam import MonWidgetParam + from InterfaceGUI.QT5.monWidgetParam import MonWidgetParam return MonWidgetParam(self, self.editor, self.item.object) diff --git a/InterfaceGUI/QT5/compoproc.py b/InterfaceGUI/QT5/compoproc.py index 2f590b68..e23ed502 100644 --- a/InterfaceGUI/QT5/compoproc.py +++ b/InterfaceGUI/QT5/compoproc.py @@ -19,15 +19,15 @@ # from Editeur import Objecttreeitem -from . import compooper -from . import browser -from . import typeNode +from InterfaceGUI.QT5 import compooper +from InterfaceGUI.QT5 import browser +from InterfaceGUI.QT5 import typeNode class Node(browser.JDCNode, typeNode.PopUpMenuNode): def getPanel(self): # print "getPanel de compoproc" - from .monWidgetCommande import MonWidgetCommande + from InterfaceGUI.QT5.monWidgetCommande import MonWidgetCommande return MonWidgetCommande(self, self.editor, self.item.object) diff --git a/InterfaceGUI/QT5/composimp.py b/InterfaceGUI/QT5/composimp.py index 51bea6bd..aa7b6160 100644 --- a/InterfaceGUI/QT5/composimp.py +++ b/InterfaceGUI/QT5/composimp.py @@ -49,7 +49,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): return None # label informatif if monObjet.isInformation(): - from InterfaceGUI.QT5.monWidgetInfo import MonWidgetInfo + from InterfaceGUI.QT5.nterfaceGUI.QT5.monWidgetInfo import MonWidgetInfo widget = MonWidgetInfo( self, maDefinition, monNom, monObjet, parentQt, maCommande diff --git a/InterfaceGUI/QT5/editor.py b/InterfaceGUI/QT5/editor.py index f19e3635..8efd3ea8 100755 --- a/InterfaceGUI/QT5/editor.py +++ b/InterfaceGUI/QT5/editor.py @@ -36,9 +36,9 @@ from Editeur import comploader from Editeur import Objecttreeitem from InterfaceGUI.QT5 import browser -from desBaseWidget import Ui_baseWidget +from UiQT5.desBaseWidget import Ui_baseWidget from InterfaceGUI.QT5.monViewTexte import ViewText -from monWidgetCreeParam import MonWidgetCreeParam +from InterfaceGUI.QT5.monWidgetCreeParam import MonWidgetCreeParam DictExtensions = {"MAP": ".map", "TELEMAC": ".cas"} debug = False @@ -334,7 +334,7 @@ class JDCEditor(JDCEditorSsIhm, Ui_baseWidget, QWidget): # ---------------------# def handleRechercher(self): # ---------------------# - from .monRecherche import DRecherche + from InterfaceGUI.QT5.monRecherche import DRecherche monRechercheDialg = DRecherche(parent=self, fl=0) monRechercheDialg.show() @@ -342,7 +342,7 @@ class JDCEditor(JDCEditorSsIhm, Ui_baseWidget, QWidget): # --------------------------------# def handleRechercherDsCatalogue(self): # -----------------------------# - from .monRechercheCatalogue import DRechercheCatalogue + from InterfaceGUI.QT5.monRechercheCatalogue import DRechercheCatalogue monRechercheDialg = DRechercheCatalogue(self.QWParent, self) monRechercheDialg.show() @@ -896,7 +896,7 @@ class JDCEditor(JDCEditorSsIhm, Ui_baseWidget, QWidget): # -----------------------------------------# try: # if 1: - from ajoutGroupe import handleAjoutGroupFiltre + from InterfaceGUI.QT5.ajoutGroupe import handleAjoutGroupFiltre # print listeGroup handleAjoutGroupFiltre(self, listeGroup) @@ -1458,7 +1458,7 @@ class JDCEditor(JDCEditorSsIhm, Ui_baseWidget, QWidget): print("in runPSEN_N1", dico) print(dico) - from Run import run + from InterfaceGUI.QT5.un import run run(dico) # res,txt_exception=run(dico) diff --git a/InterfaceGUI/QT5/feuille.py b/InterfaceGUI/QT5/feuille.py index 104e8266..8e69bb2b 100644 --- a/InterfaceGUI/QT5/feuille.py +++ b/InterfaceGUI/QT5/feuille.py @@ -28,9 +28,9 @@ from PyQt5.QtCore import Qt from Extensions.i18n import tr -from .gereIcones import ContientIcones -from .gereIcones import FacultatifOuOptionnel -from .qtSaisie import SaisieValeur +from InterfaceGUI.QT5.gereIcones import ContientIcones +from InterfaceGUI.QT5.gereIcones import FacultatifOuOptionnel +from InterfaceGUI.QT5.qtSaisie import SaisieValeur nomMax = 230 diff --git a/InterfaceGUI/QT5/gereIcones.py b/InterfaceGUI/QT5/gereIcones.py index 320e93d7..42375369 100644 --- a/InterfaceGUI/QT5/gereIcones.py +++ b/InterfaceGUI/QT5/gereIcones.py @@ -57,7 +57,7 @@ class FacultatifOuOptionnel(object): icon = QIcon(self.repIcon + "/point-interrogation30.png") self.RBInfo.setIcon(icon) - from .monWidgetCommande import MonWidgetCommande + from InterfaceGUI.QT5.monWidgetCommande import MonWidgetCommande if isinstance(self, MonWidgetCommande) and self.editor.code == "MAP": self.cle_doc = self.chercheDocMAP() else: @@ -259,7 +259,7 @@ class ContientIcones(object): fichier = self.lineEditVal.text() if fichier == None or str(fichier) == "": return - from .monViewTexte import ViewText + from InterfaceGUI.QT5.monViewTexte import ViewText try: if sys.platform[0:5] == "linux": @@ -405,8 +405,7 @@ class ContientIcones(object): self.LEvaleurPressed() def BSelectInFilePressed(self): - from monSelectImage import MonSelectImage - + from InterfaceGUI.QT5.monSelectImage import MonSelectImage MonSelectImage(file=self.image, parent=self).show() def BSalomePressed(self): @@ -487,6 +486,5 @@ class ContientIcones(object): def BParametresPressed(self): liste = self.node.item.getListeParamPossible() - from monListeParamPanel import MonListeParamPanel - + from InterfaceGUI.QT5.monListeParamPanel import MonListeParamPanel MonListeParamPanel(liste=liste, parent=self).show() diff --git a/InterfaceGUI/QT5/gereListe.py b/InterfaceGUI/QT5/gereListe.py index 466fe50c..079e50cb 100644 --- a/InterfaceGUI/QT5/gereListe.py +++ b/InterfaceGUI/QT5/gereListe.py @@ -326,7 +326,7 @@ class GereListe(object): ulfile = os.path.abspath(fn) self.editor.maConfiguration.savedir = os.path.split(ulfile)[0] - from .monSelectVal import MonSelectVal + from InterfaceGUI.QT5.monSelectVal import MonSelectVal MonSelectVal(file=fn, parent=self).show() diff --git a/InterfaceGUI/QT5/gereListeAvril11.py b/InterfaceGUI/QT5/gereListeAvril11.py index 69e809b8..6a3321d4 100644 --- a/InterfaceGUI/QT5/gereListeAvril11.py +++ b/InterfaceGUI/QT5/gereListeAvril11.py @@ -323,7 +323,7 @@ class GereListe(object): ulfile = os.path.abspath(six.text_type(fn)) self.editor.maConfiguration.savedir = os.path.split(ulfile)[0] - from .monSelectVal import MonSelectVal + from InterfaceGUI.QT5.monSelectVal import MonSelectVal MonSelectVal(file=fn, parent=self).show() diff --git a/InterfaceGUI/QT5/gereTraduction.py b/InterfaceGUI/QT5/gereTraduction.py index 208d7422..274ee609 100644 --- a/InterfaceGUI/QT5/gereTraduction.py +++ b/InterfaceGUI/QT5/gereTraduction.py @@ -82,7 +82,7 @@ def traduction(directPath, editor, version): except: pass - from .monVisu import DVisu + from InterfaceGUI.QT5.monVisu import DVisu titre = "conversion de " + FichieraTraduire monVisuDialg = DVisu(parent=editor.appliEficas, fl=0) diff --git a/InterfaceGUI/QT5/groupe.py b/InterfaceGUI/QT5/groupe.py index 576ec399..5b12bd85 100644 --- a/InterfaceGUI/QT5/groupe.py +++ b/InterfaceGUI/QT5/groupe.py @@ -24,7 +24,7 @@ from PyQt5.QtCore import Qt from Extensions.i18n import tr -from .gereIcones import FacultatifOuOptionnel +from InterfaceGUI.QT5.gereIcones import FacultatifOuOptionnel import traceback @@ -132,7 +132,7 @@ class Groupe(QWidget, FacultatifOuOptionnel): # ce cas est le cas machine tournant sr le plie try: while i < self.commandesLayout.count(): - from .monWidgetBloc import MonWidgetBloc + from InterfaceGUI.QT5.monWidgetBloc import MonWidgetBloc widget = self.commandesLayout.itemAt(i).widget() i = i + 1 diff --git a/InterfaceGUI/QT5/monChoixCata.py b/InterfaceGUI/QT5/monChoixCata.py index 585baa88..99800dbb 100644 --- a/InterfaceGUI/QT5/monChoixCata.py +++ b/InterfaceGUI/QT5/monChoixCata.py @@ -20,7 +20,7 @@ # Modules Python # Modules Eficas -from desChoixCata import Ui_DChoixCata +from InterfaceGUI.QT5.desChoixCata import Ui_DChoixCata from PyQt5.QtWidgets import QDialog from Extensions.i18n import tr diff --git a/InterfaceGUI/QT5/monChoixCode.py b/InterfaceGUI/QT5/monChoixCode.py index f6068395..7a8f3db8 100644 --- a/InterfaceGUI/QT5/monChoixCode.py +++ b/InterfaceGUI/QT5/monChoixCode.py @@ -22,7 +22,7 @@ import os, sys, re -from desChoixCode import Ui_ChoixCode +from InterfaceGUI.QT5.desChoixCode import Ui_ChoixCode from PyQt5.QtWidgets import QDialog, QRadioButton, QGroupBox, QButtonGroup from PyQt5.QtGui import QPalette from PyQt5.QtCore import QProcess, QFileInfo, Qt, QSize diff --git a/InterfaceGUI/QT5/monChoixCommande.py b/InterfaceGUI/QT5/monChoixCommande.py index 997c9370..55e060f3 100644 --- a/InterfaceGUI/QT5/monChoixCommande.py +++ b/InterfaceGUI/QT5/monChoixCommande.py @@ -19,7 +19,7 @@ # Modules Python # Modules Eficas -from desChoixCommandes import Ui_ChoixCommandes +from UiQT5.desChoixCommandes import Ui_ChoixCommandes from PyQt5.QtWidgets import QWidget, QButtonGroup, QRadioButton, QLabel, QPushButton, QGridLayout from PyQt5.QtGui import QIcon, QPixmap from PyQt5.QtCore import QSize, QRect diff --git a/InterfaceGUI/QT5/monChoixLangue.py b/InterfaceGUI/QT5/monChoixLangue.py index 0b7c815f..29981ba9 100644 --- a/InterfaceGUI/QT5/monChoixLangue.py +++ b/InterfaceGUI/QT5/monChoixLangue.py @@ -22,7 +22,7 @@ import os, sys, re -from desChoixLangue import Ui_ChoixLangue +from InterfaceGUI.QT5.desChoixLangue import Ui_ChoixLangue from PyQt5.QtWidgets import QDialog, QRadioButton, QGroupBox, QButtonGroup from PyQt5.QtGui import QPalette diff --git a/InterfaceGUI/QT5/monFonctionPanel.py b/InterfaceGUI/QT5/monFonctionPanel.py index c3ca96ad..d29dc8a2 100644 --- a/InterfaceGUI/QT5/monFonctionPanel.py +++ b/InterfaceGUI/QT5/monFonctionPanel.py @@ -24,8 +24,8 @@ from PyQt5.QtCore import Qt # Modules Eficas -from .qtSaisie import SaisieValeur -from monPlusieursBasePanel import MonPlusieursBasePanel +from InterfaceGUI.QT5.qtSaisie import SaisieValeur +from InterfaceGUI.QT5.monPlusieursBasePanel import MonPlusieursBasePanel from Extensions.i18n import tr diff --git a/InterfaceGUI/QT5/monGroupeOptionnel.py b/InterfaceGUI/QT5/monGroupeOptionnel.py index 00cdc5ce..4f60f3e0 100644 --- a/InterfaceGUI/QT5/monGroupeOptionnel.py +++ b/InterfaceGUI/QT5/monGroupeOptionnel.py @@ -25,8 +25,8 @@ from PyQt5.QtCore import Qt, QRect from PyQt5.QtGui import QPalette from Extensions.i18n import tr -from desGroupeOptionnel import Ui_groupeOptionnel -from desPBOptionnelMT import Ui_customPB +from InterfaceGUI.QT5.desGroupeOptionnel import Ui_groupeOptionnel +from InterfaceGUI.QT5.desPBOptionnelMT import Ui_customPB # Import des panels diff --git a/InterfaceGUI/QT5/monRecherche.py b/InterfaceGUI/QT5/monRecherche.py index b4823568..0fc0b0e8 100644 --- a/InterfaceGUI/QT5/monRecherche.py +++ b/InterfaceGUI/QT5/monRecherche.py @@ -20,7 +20,7 @@ # Modules Python # Modules Eficas -from desRecherche import Ui_desRecherche +from InterfaceGUI.QT5.desRecherche import Ui_desRecherche from PyQt5.QtWidgets import QDialog from PyQt5.QtCore import Qt diff --git a/InterfaceGUI/QT5/monRechercheCatalogue.py b/InterfaceGUI/QT5/monRechercheCatalogue.py index 8682ac55..3182b44e 100644 --- a/InterfaceGUI/QT5/monRechercheCatalogue.py +++ b/InterfaceGUI/QT5/monRechercheCatalogue.py @@ -20,7 +20,7 @@ # Modules Python # Modules Eficas -from desRechercheCatalogue import Ui_desRechercheCatalogue +from InterfaceGUI.QT5.desRechercheCatalogue import Ui_desRechercheCatalogue from PyQt5.QtWidgets import QDialog, QCompleter from PyQt5.QtCore import Qt diff --git a/InterfaceGUI/QT5/monSelectVal.py b/InterfaceGUI/QT5/monSelectVal.py index ad953ea1..d3f2ce2a 100644 --- a/InterfaceGUI/QT5/monSelectVal.py +++ b/InterfaceGUI/QT5/monSelectVal.py @@ -20,7 +20,7 @@ # Modules Python # Modules Eficas -from desSelectVal import Ui_DSelVal +from InterfaceGUI.QT5.desSelectVal import Ui_DSelVal from Extensions.i18n import tr from PyQt5.QtWidgets import QDialog, QFileDialog, QMessageBox diff --git a/InterfaceGUI/QT5/monViewRegles.py b/InterfaceGUI/QT5/monViewRegles.py index dcac7419..abc41171 100644 --- a/InterfaceGUI/QT5/monViewRegles.py +++ b/InterfaceGUI/QT5/monViewRegles.py @@ -25,7 +25,7 @@ import traceback from Extensions.i18n import tr from PyQt5.QtCore import Qt from PyQt5.QtWidgets import QDialog, QListWidgetItem -from desViewRegles import Ui_viewRegles +from UiQT5.desViewRegles import Ui_viewRegles # ------------------------------------ # diff --git a/InterfaceGUI/QT5/monViewTexte.py b/InterfaceGUI/QT5/monViewTexte.py index 671ce6aa..cbb29787 100644 --- a/InterfaceGUI/QT5/monViewTexte.py +++ b/InterfaceGUI/QT5/monViewTexte.py @@ -26,7 +26,7 @@ from Extensions.i18n import tr from PyQt5.QtWidgets import QDialog, QMessageBox, QFileDialog from PyQt5.QtCore import QSize -from desViewTexte import Ui_dView +from UiQT5.desViewTexte import Ui_dView # ------------------------------- # diff --git a/InterfaceGUI/QT5/monVisu.py b/InterfaceGUI/QT5/monVisu.py index 0264b578..c5ba0013 100644 --- a/InterfaceGUI/QT5/monVisu.py +++ b/InterfaceGUI/QT5/monVisu.py @@ -21,7 +21,7 @@ # Modules Eficas -from desVisu import Ui_DVisu +from InterfaceGUI.QT5.desVisu import Ui_DVisu from PyQt5.QtWidgets import QDialog diff --git a/InterfaceGUI/QT5/monWidget4a6RadioButton.py b/InterfaceGUI/QT5/monWidget4a6RadioButton.py index 8ed8257a..8c0bc7df 100644 --- a/InterfaceGUI/QT5/monWidget4a6RadioButton.py +++ b/InterfaceGUI/QT5/monWidget4a6RadioButton.py @@ -24,8 +24,8 @@ import types, os # Modules Eficas from Extensions.i18n import tr -from .monWidgetRadioButton import MonWidgetRadioButtonCommun -from desWidget4a6RadioButton import Ui_Widget4a6RadioButton +from InterfaceGUI.QT5.monWidgetRadioButton import MonWidgetRadioButtonCommun +from UiQT5.desWidget4a6RadioButton import Ui_Widget4a6RadioButton class MonWidget4a6RadioButton(Ui_Widget4a6RadioButton, MonWidgetRadioButtonCommun): diff --git a/InterfaceGUI/QT5/monWidget4a6RadioButtonSD.py b/InterfaceGUI/QT5/monWidget4a6RadioButtonSD.py index e3d29ec6..da6e5df8 100644 --- a/InterfaceGUI/QT5/monWidget4a6RadioButtonSD.py +++ b/InterfaceGUI/QT5/monWidget4a6RadioButtonSD.py @@ -24,8 +24,8 @@ import types, os # Modules Eficas from Extensions.i18n import tr -from .monWidgetRadioButton import MonWidgetRadioButtonCommun -from desWidget4a6RadioButton import Ui_Widget4a6RadioButton +from InterfaceGUI.QT5.monWidgetRadioButton import MonWidgetRadioButtonCommun +from UiQT5.desWidget4a6RadioButton import Ui_Widget4a6RadioButton class MonWidget4a6RadioButtonSD(Ui_Widget4a6RadioButton, MonWidgetRadioButtonCommun): diff --git a/InterfaceGUI/QT5/monWidgetBloc.py b/InterfaceGUI/QT5/monWidgetBloc.py index a45410ce..7f3c786e 100644 --- a/InterfaceGUI/QT5/monWidgetBloc.py +++ b/InterfaceGUI/QT5/monWidgetBloc.py @@ -20,8 +20,8 @@ # Modules Eficas -from desWidgetBloc import Ui_WidgetBloc -from .groupe import Groupe +from InterfaceGUI.QT5.desWidgetBloc import Ui_WidgetBloc +from InterfaceGUI.QT5.groupe import Groupe from Extensions.i18n import tr # Import des panels diff --git a/InterfaceGUI/QT5/monWidgetCB.py b/InterfaceGUI/QT5/monWidgetCB.py index 7c685fa4..c9edb427 100644 --- a/InterfaceGUI/QT5/monWidgetCB.py +++ b/InterfaceGUI/QT5/monWidgetCB.py @@ -25,7 +25,7 @@ import types, os from Extensions.i18n import tr from InterfaceGUI.QT5.feuille import Feuille -from desWidgetCB import Ui_WidgetCB +from UiQT5.desWidgetCB import Ui_WidgetCB from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique from InterfaceGUI.QT5.qtSaisie import SaisieValeur diff --git a/InterfaceGUI/QT5/monWidgetCBIntoSug.py b/InterfaceGUI/QT5/monWidgetCBIntoSug.py index 6fc25826..607d8c08 100644 --- a/InterfaceGUI/QT5/monWidgetCBIntoSug.py +++ b/InterfaceGUI/QT5/monWidgetCBIntoSug.py @@ -25,16 +25,16 @@ import types, os # Modules Eficas from Extensions.i18n import tr -from .feuille import Feuille -from .politiquesValidation import PolitiqueUnique -from .qtSaisie import SaisieValeur -from desWidgetCBIntoSug import Ui_WidgetCBIntoSug +from InterfaceGUI.QT5.feuille import Feuille +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.qtSaisie import SaisieValeur +from UiQT5.desWidgetCBIntoSug import Ui_WidgetCBIntoSug from PyQt5.QtWidgets import QComboBox, QCompleter from PyQt5.QtCore import Qt -from monWidgetCB import MonWidgetCBCommun -from monWidgetIntoSug import GereAjoutDsPossible +from InterfaceGUI.QT5.monWidgetCB import MonWidgetCBCommun +from InterfaceGUI.QT5.monWidgetIntoSug import GereAjoutDsPossible class MonWidgetCBIntoSug(MonWidgetCBCommun, Ui_WidgetCBIntoSug, GereAjoutDsPossible): diff --git a/InterfaceGUI/QT5/monWidgetCBSD.py b/InterfaceGUI/QT5/monWidgetCBSD.py index df793c13..ed8d47b3 100644 --- a/InterfaceGUI/QT5/monWidgetCBSD.py +++ b/InterfaceGUI/QT5/monWidgetCBSD.py @@ -24,10 +24,10 @@ import types, os # Modules Eficas from Extensions.i18n import tr -from .feuille import Feuille -from desWidgetCB import Ui_WidgetCB -from .politiquesValidation import PolitiqueUnique -from .qtSaisie import SaisieValeur +from InterfaceGUI.QT5.feuille import Feuille +from UiQT5.desWidgetCB import Ui_WidgetCB +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.qtSaisie import SaisieValeur from PyQt5.QtWidgets import QComboBox, QCompleter diff --git a/InterfaceGUI/QT5/monWidgetCommande.py b/InterfaceGUI/QT5/monWidgetCommande.py index 76368930..75d03475 100644 --- a/InterfaceGUI/QT5/monWidgetCommande.py +++ b/InterfaceGUI/QT5/monWidgetCommande.py @@ -21,9 +21,9 @@ import types -from desWidgetCommande import Ui_WidgetCommande -from .groupe import Groupe -from .gereIcones import FacultatifOuOptionnel +from UiQT5.desWidgetCommande import Ui_WidgetCommande +from InterfaceGUI.QT5.groupe import Groupe +from InterfaceGUI.QT5.gereIcones import FacultatifOuOptionnel from PyQt5.QtWidgets import ( QApplication, @@ -120,7 +120,7 @@ class MonWidgetCommande(Ui_WidgetCommande, Groupe): if self.editor.maConfiguration.pasDeMCOptionnels: return # Pas de MC Optionnels pour Carmel - from .monWidgetOptionnel import MonWidgetOptionnel + from InterfaceGUI.QT5.monWidgetOptionnel import MonWidgetOptionnel if self.editor.widgetOptionnel != None: self.monOptionnel = self.editor.widgetOptionnel @@ -239,7 +239,7 @@ class MonWidgetCommande(Ui_WidgetCommande, Groupe): # Notation scientifique if test: - from .politiquesValidation import Validation + from InterfaceGUI.QT5.politiquesValidation import Validation validation = Validation(self.node, self.editor) validation.ajoutDsDictReelEtape() diff --git a/InterfaceGUI/QT5/monWidgetCommentaire.py b/InterfaceGUI/QT5/monWidgetCommentaire.py index 13b0b05a..2a668933 100644 --- a/InterfaceGUI/QT5/monWidgetCommentaire.py +++ b/InterfaceGUI/QT5/monWidgetCommentaire.py @@ -23,7 +23,7 @@ from PyQt5.QtWidgets import QWidget from PyQt5.QtCore import Qt from desWidgetCommentaire import Ui_WidgetCommentaire -from .gereIcones import FacultatifOuOptionnel +from InterfaceGUI.QT5.gereIcones import FacultatifOuOptionnel from Extensions.i18n import tr import Accas import os diff --git a/InterfaceGUI/QT5/monWidgetCreeParam.py b/InterfaceGUI/QT5/monWidgetCreeParam.py index 97c048cb..264a836f 100644 --- a/InterfaceGUI/QT5/monWidgetCreeParam.py +++ b/InterfaceGUI/QT5/monWidgetCreeParam.py @@ -27,7 +27,7 @@ pattern_name = re.compile(r"^[^\d\W]\w*\Z") from PyQt5.QtWidgets import QDialog, QMessageBox from PyQt5.QtCore import Qt from Extensions.i18n import tr -from desWidgetCreeParam import Ui_desWidgetCreeParam +from UiQT5.desWidgetCreeParam import Ui_desWidgetCreeParam class MonWidgetCreeParam(Ui_desWidgetCreeParam, QDialog): @@ -95,7 +95,7 @@ class MonWidgetCreeParam(Ui_desWidgetCreeParam, QDialog): valString = str(self.lineEditVal.text()) self.val = "" contexte = {} - exec("from math import *", contexte) + exec("from InterfaceGUI.QT5.ath import *", contexte) jdc = self.editor.jdc if jdc == None: self.editor.afficheInfos( diff --git a/InterfaceGUI/QT5/monWidgetCreeUserAssd.py b/InterfaceGUI/QT5/monWidgetCreeUserAssd.py index 70b7d2dc..f1add841 100644 --- a/InterfaceGUI/QT5/monWidgetCreeUserAssd.py +++ b/InterfaceGUI/QT5/monWidgetCreeUserAssd.py @@ -22,8 +22,8 @@ import types, os # Modules Eficas from Extensions.i18n import tr -from .monWidgetSimpTxt import MonWidgetSimpTxt -from .monWidgetPlusieursBase import MonWidgetPlusieursBase +from InterfaceGUI.QT5.monWidgetSimpTxt import MonWidgetSimpTxt +from InterfaceGUI.QT5.monWidgetPlusieursBase import MonWidgetPlusieursBase from copy import copy, deepcopy from PyQt5.QtCore import Qt diff --git a/InterfaceGUI/QT5/monWidgetDate.py b/InterfaceGUI/QT5/monWidgetDate.py index 40a475f9..4be5fbad 100644 --- a/InterfaceGUI/QT5/monWidgetDate.py +++ b/InterfaceGUI/QT5/monWidgetDate.py @@ -23,9 +23,9 @@ import types, os # Modules Eficas from Extensions.i18n import tr -from .feuille import Feuille -from .monWidgetSimpTuple import MonWidgetSimpTuple -from desWidgetDate import Ui_WidgetDate +from InterfaceGUI.QT5.feuille import Feuille +from InterfaceGUI.QT5.monWidgetSimpTuple import MonWidgetSimpTuple +from UiQT5.desWidgetDate import Ui_WidgetDate class MonWidgetDate(Ui_WidgetDate, MonWidgetSimpTuple): diff --git a/InterfaceGUI/QT5/monWidgetFact.py b/InterfaceGUI/QT5/monWidgetFact.py index d9868e9f..26f70427 100644 --- a/InterfaceGUI/QT5/monWidgetFact.py +++ b/InterfaceGUI/QT5/monWidgetFact.py @@ -20,8 +20,8 @@ from PyQt5.QtCore import Qt, QTimer from PyQt5.QtWidgets import QWidget -from .groupe import Groupe -from desWidgetFact import Ui_WidgetFact +from InterfaceGUI.QT5.groupe import Groupe +from UiQT5.desWidgetFact import Ui_WidgetFact from Extensions.i18n import tr # Import des panels @@ -74,7 +74,7 @@ class MonWidgetFactCommun(Groupe): def ajouteMCParPB(self): texteListeNom = "+" + self.obj.nom parentOuAjouter = self.parentQt - from .monWidgetBloc import MonWidgetBloc + from InterfaceGUI.QT5.monWidgetBloc import MonWidgetBloc while parentOuAjouter and isinstance(parentOuAjouter, MonWidgetBloc): parentOuAjouter = parentOuAjouter.parentQt diff --git a/InterfaceGUI/QT5/monWidgetFactPlie.py b/InterfaceGUI/QT5/monWidgetFactPlie.py index 91a55b63..137f60f3 100644 --- a/InterfaceGUI/QT5/monWidgetFactPlie.py +++ b/InterfaceGUI/QT5/monWidgetFactPlie.py @@ -17,8 +17,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from desWidgetFactPlie import Ui_WidgetFactPlie -from .groupe import Groupe +from UiQT5.desWidgetFactPlie import Ui_WidgetFactPlie +from InterfaceGUI.QT5.groupe import Groupe from Extensions.i18n import tr class MonWidgetFactPlie(Ui_WidgetFactPlie, Groupe): diff --git a/InterfaceGUI/QT5/monWidgetFormule.py b/InterfaceGUI/QT5/monWidgetFormule.py index ab795b9e..e342376f 100644 --- a/InterfaceGUI/QT5/monWidgetFormule.py +++ b/InterfaceGUI/QT5/monWidgetFormule.py @@ -17,8 +17,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from desWidgetFormule import Ui_WidgetFormule -from .gereIcones import FacultatifOuOptionnel +from UiQT5.desWidgetFormule import Ui_WidgetFormule +from InterfaceGUI.QT5.gereIcones import FacultatifOuOptionnel from PyQt5.QtWidgets import QWidget from PyQt5.QtGui import QIcon diff --git a/InterfaceGUI/QT5/monWidgetHeure.py b/InterfaceGUI/QT5/monWidgetHeure.py index 25a585df..1dbc759c 100644 --- a/InterfaceGUI/QT5/monWidgetHeure.py +++ b/InterfaceGUI/QT5/monWidgetHeure.py @@ -23,9 +23,9 @@ import types, os # Modules Eficas from Extensions.i18n import tr -from .feuille import Feuille -from .monWidgetSimpBase import MonWidgetSimpBase -from desWidgetHeure import Ui_WidgetHeure +from InterfaceGUI.QT5.feuille import Feuille +from InterfaceGUI.QT5.monWidgetSimpBase import MonWidgetSimpBase +from UiQT5.desWidgetHeure import Ui_WidgetHeure class MonWidgetHeure(Ui_WidgetHeure, MonWidgetSimpBase): diff --git a/InterfaceGUI/QT5/monWidgetInactif.py b/InterfaceGUI/QT5/monWidgetInactif.py index 590d0128..90d13a47 100644 --- a/InterfaceGUI/QT5/monWidgetInactif.py +++ b/InterfaceGUI/QT5/monWidgetInactif.py @@ -21,7 +21,7 @@ from PyQt5.QtWidgets import QWidget from Extensions.i18n import tr -from desWidgetInactif import Ui_WidgetInactif +from UiQT5.desWidgetInactif import Ui_WidgetInactif import Accas import os @@ -37,7 +37,7 @@ class MonWidgetInactif(QWidget, Ui_WidgetInactif): self.node = node self.editor = editor self.setupUi(self) - from .monWidgetOptionnel import MonWidgetOptionnel + from InterfaceGUI.QT5.monWidgetOptionnel import MonWidgetOptionnel if self.editor.widgetOptionnel != None: self.monOptionnel = self.editor.widgetOptionnel diff --git a/InterfaceGUI/QT5/monWidgetInfo.py b/InterfaceGUI/QT5/monWidgetInfo.py index 0c311e36..cba1ab49 100644 --- a/InterfaceGUI/QT5/monWidgetInfo.py +++ b/InterfaceGUI/QT5/monWidgetInfo.py @@ -24,7 +24,7 @@ import types, os from PyQt5.QtWidgets import QWidget from Extensions.i18n import tr -from desWidgetInformation import Ui_WidgetInformative +from UiQT5.desWidgetInformation import Ui_WidgetInformative class MonWidgetInfo(Ui_WidgetInformative, QWidget): diff --git a/InterfaceGUI/QT5/monWidgetIntoSug.py b/InterfaceGUI/QT5/monWidgetIntoSug.py index 44c30cc3..29dc2d87 100644 --- a/InterfaceGUI/QT5/monWidgetIntoSug.py +++ b/InterfaceGUI/QT5/monWidgetIntoSug.py @@ -28,8 +28,8 @@ from PyQt5.QtCore import Qt from Extensions.i18n import tr -from desWidgetIntoSug import Ui_WidgetIntoSug -from monWidgetPlusieursInto import MonWidgetPlusieursInto +from UiQT5.desWidgetIntoSug import Ui_WidgetIntoSug +from InterfaceGUI.QT5.monWidgetPlusieursInto import MonWidgetPlusieursInto class GereAjoutDsPossible: diff --git a/InterfaceGUI/QT5/monWidgetMatrice.py b/InterfaceGUI/QT5/monWidgetMatrice.py index 9bf49af8..93dd4a70 100644 --- a/InterfaceGUI/QT5/monWidgetMatrice.py +++ b/InterfaceGUI/QT5/monWidgetMatrice.py @@ -22,11 +22,11 @@ import types, os, sys # Modules Eficas from Extensions.i18n import tr -from .feuille import Feuille +from InterfaceGUI.QT5..feuille import Feuille from Extensions.eficas_exception import EficasException -from desWidgetMatrice import Ui_desWidgetMatrice +from UiQT5.desWidgetMatrice import Ui_desWidgetMatrice from PyQt5.QtCore import QSize, Qt from PyQt5.QtWidgets import QTableWidgetItem, QTableWidget diff --git a/InterfaceGUI/QT5/monWidgetNiveauFact.py b/InterfaceGUI/QT5/monWidgetNiveauFact.py index ada2e67a..5c11d520 100644 --- a/InterfaceGUI/QT5/monWidgetNiveauFact.py +++ b/InterfaceGUI/QT5/monWidgetNiveauFact.py @@ -21,7 +21,7 @@ import types, os from PyQt5.QtWidgets import QWidget from PyQt5.QtGui import QIcon -from desWidgetNiveauFact import Ui_WidgetNiveauFact +from UiQT5.desWidgetNiveauFact import Ui_WidgetNiveauFact from InterfaceGUI.QT5.monWidgetOptionnel import MonWidgetOptionnel from InterfaceGUI.QT5.groupe import Groupe diff --git a/InterfaceGUI/QT5/monWidgetOptionnel.py b/InterfaceGUI/QT5/monWidgetOptionnel.py index c8095943..ae3c5e84 100644 --- a/InterfaceGUI/QT5/monWidgetOptionnel.py +++ b/InterfaceGUI/QT5/monWidgetOptionnel.py @@ -22,8 +22,8 @@ from PyQt5.QtWidgets import QCheckBox, QWidget from PyQt5.QtCore import Qt from Extensions.i18n import tr -from desWidgetOptionnel import Ui_WidgetOptionnel -from .monGroupeOptionnel import MonGroupeOptionnel +from UiQT5.desWidgetOptionnel import Ui_WidgetOptionnel +from InterfaceQT5.QT5.monGroupeOptionnel import MonGroupeOptionnel # Import des panels diff --git a/InterfaceGUI/QT5/monWidgetParam.py b/InterfaceGUI/QT5/monWidgetParam.py index 8655294e..d66877a1 100644 --- a/InterfaceGUI/QT5/monWidgetParam.py +++ b/InterfaceGUI/QT5/monWidgetParam.py @@ -20,7 +20,7 @@ import os, re import types -from desWidgetParam import Ui_WidgetParam +from UiQT5.desWidgetParam import Ui_WidgetParam from InterfaceGUI.QT5.gereIcones import FacultatifOuOptionnel from PyQt5.QtWidgets import QWidget, QMessageBox from PyQt5.QtGui import QIcon @@ -113,7 +113,7 @@ class MonWidgetParam(QWidget, Ui_WidgetParam, FacultatifOuOptionnel): valString = str(self.lineEditVal.text()) contexte = {} - exec("from math import *", contexte) + exec("from InterfaceGUI.QT5.ath import *", contexte) jdc = self.node.item.getJdc() for p in jdc.params: try: diff --git a/InterfaceGUI/QT5/monWidgetPlusieursASSDIntoOrdonne.py b/InterfaceGUI/QT5/monWidgetPlusieursASSDIntoOrdonne.py index 78266de1..acbbb5ef 100644 --- a/InterfaceGUI/QT5/monWidgetPlusieursASSDIntoOrdonne.py +++ b/InterfaceGUI/QT5/monWidgetPlusieursASSDIntoOrdonne.py @@ -20,10 +20,9 @@ # Modules Eficas from Extensions.i18n import tr -from .monWidgetPlusieursIntoOrdonne import MonWidgetPlusieursIntoOrdonne -from .politiquesValidation import PolitiquePlusieurs +from InterfaceGUI.QT5..monWidgetPlusieursIntoOrdonne import MonWidgetPlusieursIntoOrdonne +from InterfaceGUI.QT5.politiquesValidation import PolitiquePlusieurs -from six.moves import range from PyQt5.QtWidgets import QScrollBar diff --git a/InterfaceGUI/QT5/monWidgetPlusieursBase.py b/InterfaceGUI/QT5/monWidgetPlusieursBase.py index f5162bc5..c45fa918 100644 --- a/InterfaceGUI/QT5/monWidgetPlusieursBase.py +++ b/InterfaceGUI/QT5/monWidgetPlusieursBase.py @@ -28,7 +28,7 @@ from PyQt5.QtCore import QTimer, QSize, Qt from Extensions.i18n import tr from InterfaceGUI.QT5.feuille import Feuille -from desWidgetPlusieursBase import Ui_WidgetPlusieursBase +from UiQT5.desWidgetPlusieursBase import Ui_WidgetPlusieursBase from InterfaceGUI.QT5.politiquesValidation import PolitiquePlusieurs from InterfaceGUI.QT5.qtSaisie import SaisieValeur from InterfaceGUI.QT5.gereListe import GereListe diff --git a/InterfaceGUI/QT5/monWidgetPlusieursCreeUserAssd.py b/InterfaceGUI/QT5/monWidgetPlusieursCreeUserAssd.py index 5514652c..4829d0c8 100644 --- a/InterfaceGUI/QT5/monWidgetPlusieursCreeUserAssd.py +++ b/InterfaceGUI/QT5/monWidgetPlusieursCreeUserAssd.py @@ -20,8 +20,8 @@ # Modules Eficas from Extensions.i18n import tr -from .monWidgetSimpTxt import MonWidgetSimpTxt -from .monWidgetPlusieursBase import MonWidgetPlusieursBase +from InterfaceGUI.QT5.monWidgetSimpTxt import MonWidgetSimpTxt +from InterfaceGUI.QT5.monWidgetPlusieursBase import MonWidgetPlusieursBase from copy import copy, deepcopy from PyQt5.QtCore import Qt diff --git a/InterfaceGUI/QT5/monWidgetPlusieursInto.py b/InterfaceGUI/QT5/monWidgetPlusieursInto.py index c4230965..f2c4d7ba 100644 --- a/InterfaceGUI/QT5/monWidgetPlusieursInto.py +++ b/InterfaceGUI/QT5/monWidgetPlusieursInto.py @@ -27,7 +27,7 @@ from PyQt5.QtCore import Qt from Extensions.i18n import tr from InterfaceGUI.QT5.feuille import Feuille -from desWidgetPlusieursInto import Ui_WidgetPlusieursInto +from UiQT5.desWidgetPlusieursInto import Ui_WidgetPlusieursInto from InterfaceGUI.QT5.politiquesValidation import PolitiquePlusieurs from InterfaceGUI.QT5.qtSaisie import SaisieValeur from InterfaceGUI.QT5.gereListe import GerePlie diff --git a/InterfaceGUI/QT5/monWidgetPlusieursIntoOrdonne.py b/InterfaceGUI/QT5/monWidgetPlusieursIntoOrdonne.py index 81e69236..6470fe13 100644 --- a/InterfaceGUI/QT5/monWidgetPlusieursIntoOrdonne.py +++ b/InterfaceGUI/QT5/monWidgetPlusieursIntoOrdonne.py @@ -21,14 +21,14 @@ import types, os # Modules Eficas -from .feuille import Feuille -from desWidgetPlusieursIntoOrdonne import Ui_WidgetPlusieursIntoOrdonne -from .politiquesValidation import PolitiquePlusieurs -from .qtSaisie import SaisieValeur -from .gereListe import GereListe -from .gereListe import GerePlie -from .gereListe import LECustom -from .gereListe import MonLabelListeClic +from InterfaceGUI.QT5.feuille import Feuille +from UiQT5.desWidgetPlusieursIntoOrdonne import Ui_WidgetPlusieursIntoOrdonne +from InterfaceGUI.QT5.politiquesValidation import PolitiquePlusieurs +from InterfaceGUI.QT5.qtSaisie import SaisieValeur +from InterfaceGUI.QT5.gereListe import GereListe +from InterfaceGUI.QT5.gereListe import GerePlie +from InterfaceGUI.QT5.gereListe import LECustom +from InterfaceGUI.QT5.gereListe import MonLabelListeClic from Extensions.i18n import tr from PyQt5.QtWidgets import QFrame, QApplication, QScrollBar diff --git a/InterfaceGUI/QT5/monWidgetPlusieursPlie.py b/InterfaceGUI/QT5/monWidgetPlusieursPlie.py index 6eddb2c3..868044ec 100644 --- a/InterfaceGUI/QT5/monWidgetPlusieursPlie.py +++ b/InterfaceGUI/QT5/monWidgetPlusieursPlie.py @@ -25,11 +25,11 @@ from PyQt5.QtGui import QIcon, QBrush, QColor from Extensions.i18n import tr -from .feuille import Feuille -from desWidgetPlusieursPlie import Ui_WidgetPlusieursPlie +from InterfaceGUI.QT5.feuille import Feuille +from UiQT5.desWidgetPlusieursPlie import Ui_WidgetPlusieursPlie -from .politiquesValidation import PolitiquePlusieurs -from .qtSaisie import SaisieValeur +from InterfaceGUI.QT5.politiquesValidation import PolitiquePlusieurs +from InterfaceGUI.QT5.qtSaisie import SaisieValeur pattern_blanc = re.compile(r"^\s*$") diff --git a/InterfaceGUI/QT5/monWidgetPlusieursTuple.py b/InterfaceGUI/QT5/monWidgetPlusieursTuple.py index 0206b597..e9d36e40 100644 --- a/InterfaceGUI/QT5/monWidgetPlusieursTuple.py +++ b/InterfaceGUI/QT5/monWidgetPlusieursTuple.py @@ -24,21 +24,20 @@ from PyQt5.QtCore import QSize, Qt, QTimer from Extensions.i18n import tr - from InterfaceGUI.QT5.feuille import Feuille from InterfaceGUI.QT5.politiquesValidation import PolitiquePlusieurs from InterfaceGUI.QT5.qtSaisie import SaisieValeur from InterfaceGUI.QT5.gereListe import GereListe from InterfaceGUI.QT5.gereListe import LECustom -from Tuple2 import Ui_Tuple2 -from Tuple3 import Ui_Tuple3 -from Tuple4 import Ui_Tuple4 -from Tuple5 import Ui_Tuple5 -from Tuple6 import Ui_Tuple6 -from Tuple7 import Ui_Tuple7 -from Tuple8 import Ui_Tuple8 -from Tuple9 import Ui_Tuple9 -from Tuple10 import Ui_Tuple10 +from UiQT5.Tuple2 import Ui_Tuple2 +from UiQT5.Tuple3 import Ui_Tuple3 +from UiQT5.Tuple4 import Ui_Tuple4 +from UiQT5.Tuple5 import Ui_Tuple5 +from UiQT5.Tuple6 import Ui_Tuple6 +from UiQT5.Tuple7 import Ui_Tuple7 +from UiQT5.Tuple8 import Ui_Tuple8 +from UiQT5.Tuple9 import Ui_Tuple9 +from UiQT5.Tuple10 import Ui_Tuple10 # -------------------------- diff --git a/InterfaceGUI/QT5/monWidgetPlusieursTupleN.py b/InterfaceGUI/QT5/monWidgetPlusieursTupleN.py index f519bb49..d18e337c 100644 --- a/InterfaceGUI/QT5/monWidgetPlusieursTupleN.py +++ b/InterfaceGUI/QT5/monWidgetPlusieursTupleN.py @@ -18,9 +18,9 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from .feuille import Feuille -from .monWidgetPlusieursTuple import MonWidgetPlusieursTuple -from desWidgetPlusieursTuple import Ui_WidgetPlusieursTuple +from InterfaceGUI.QT5.feuille import Feuille +from InterfaceGUI.QT5.monWidgetPlusieursTuple import MonWidgetPlusieursTuple +from UiQT5.desWidgetPlusieursTuple import Ui_WidgetPlusieursTuple class MonWidgetPlusieursTuple2(Ui_WidgetPlusieursTuple, MonWidgetPlusieursTuple): diff --git a/InterfaceGUI/QT5/monWidgetRadioButton.py b/InterfaceGUI/QT5/monWidgetRadioButton.py index 4ec57193..621357ea 100644 --- a/InterfaceGUI/QT5/monWidgetRadioButton.py +++ b/InterfaceGUI/QT5/monWidgetRadioButton.py @@ -28,10 +28,10 @@ from PyQt5.QtWidgets import QWidget from Extensions.i18n import tr -from .feuille import Feuille -from desWidgetRadioButton import Ui_WidgetRadioButton -from .politiquesValidation import PolitiqueUnique -from .qtSaisie import SaisieValeur +from InterfaceGUI.QT5.feuille import Feuille +from UiQT5.desWidgetRadioButton import Ui_WidgetRadioButton +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.qtSaisie import SaisieValeur class MonWidgetRadioButtonCommun(Feuille): diff --git a/InterfaceGUI/QT5/monWidgetSDCOInto.py b/InterfaceGUI/QT5/monWidgetSDCOInto.py index a718ea44..00e84b92 100644 --- a/InterfaceGUI/QT5/monWidgetSDCOInto.py +++ b/InterfaceGUI/QT5/monWidgetSDCOInto.py @@ -23,10 +23,10 @@ from PyQt5.QtWidgets import QLineEdit from PyQt5.QtCore import Qt from Extensions.i18n import tr -from .feuille import Feuille -from desWidgetSDCOInto import Ui_WidgetSDCOInto -from .qtSaisie import SaisieSDCO -from .politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.feuille import Feuille +from UiQT5.desWidgetSDCOInto import Ui_WidgetSDCOInto +from InterfaceGUI.QT5.qtSaisie import SaisieSDCO +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique class MonWidgetSDCOInto(Ui_WidgetSDCOInto, Feuille, SaisieSDCO): diff --git a/InterfaceGUI/QT5/monWidgetSimpBase.py b/InterfaceGUI/QT5/monWidgetSimpBase.py index b80b41de..24c85557 100644 --- a/InterfaceGUI/QT5/monWidgetSimpBase.py +++ b/InterfaceGUI/QT5/monWidgetSimpBase.py @@ -23,10 +23,10 @@ from PyQt5.QtWidgets import QLineEdit from PyQt5.QtCore import Qt from Extensions.i18n import tr -from .feuille import Feuille -from desWidgetSimpBase import Ui_WidgetSimpBase -from .politiquesValidation import PolitiqueUnique -from .qtSaisie import SaisieValeur +from InterfaceGUI.QT5.feuille import Feuille +from UiQT5.desWidgetSimpBase import Ui_WidgetSimpBase +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.qtSaisie import SaisieValeur class MonWidgetSimpBase(Ui_WidgetSimpBase, Feuille): @@ -69,7 +69,7 @@ class MonWidgetSimpBase(Ui_WidgetSimpBase, Feuille): chaine = "" if valeurTexte != None: - from decimal import Decimal + from InterfaceGUI.QT5.ecimal import Decimal if isinstance(valeurTexte, Decimal): chaine = str(valeurTexte) diff --git a/InterfaceGUI/QT5/monWidgetSimpBool.py b/InterfaceGUI/QT5/monWidgetSimpBool.py index 6c4ebbfa..db827bfc 100644 --- a/InterfaceGUI/QT5/monWidgetSimpBool.py +++ b/InterfaceGUI/QT5/monWidgetSimpBool.py @@ -22,10 +22,10 @@ from PyQt5.QtWidgets import QRadioButton from Extensions.i18n import tr -from .feuille import Feuille -from desWidgetSimpBool import Ui_WidgetSimpBool -from .politiquesValidation import PolitiqueUnique -from .qtSaisie import SaisieValeur +from InterfaceGUI.QT5.feuille import Feuille +fromUiQT5.desWidgetSimpBool import Ui_WidgetSimpBool +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.qtSaisie import SaisieValeur class MonWidgetSimpBool(Ui_WidgetSimpBool, Feuille): diff --git a/InterfaceGUI/QT5/monWidgetSimpComplexe.py b/InterfaceGUI/QT5/monWidgetSimpComplexe.py index 956ec582..71c912a1 100644 --- a/InterfaceGUI/QT5/monWidgetSimpComplexe.py +++ b/InterfaceGUI/QT5/monWidgetSimpComplexe.py @@ -27,10 +27,10 @@ from PyQt5.QtCore import Qt from Extensions.i18n import tr -from .feuille import Feuille -from desWidgetSimpComplexe import Ui_WidgetSimpComplexe -from .politiquesValidation import PolitiqueUnique -from .qtSaisie import SaisieValeur +from InterfaceGUI.QT5.feuille import Feuille +from UiQT5.desWidgetSimpComplexe import Ui_WidgetSimpComplexe +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.qtSaisie import SaisieValeur class MonWidgetSimpComplexe(Ui_WidgetSimpComplexe, Feuille): diff --git a/InterfaceGUI/QT5/monWidgetSimpFichier.py b/InterfaceGUI/QT5/monWidgetSimpFichier.py index c456df05..5ef13e48 100644 --- a/InterfaceGUI/QT5/monWidgetSimpFichier.py +++ b/InterfaceGUI/QT5/monWidgetSimpFichier.py @@ -24,8 +24,8 @@ from PyQt5.QtGui import QIcon from PyQt5.QtCore import QSize from Extensions.i18n import tr -from desWidgetSimpFichier import Ui_WidgetSimpFichier -from .monWidgetSimpBase import MonWidgetSimpBase +from UiQT5.desWidgetSimpFichier import Ui_WidgetSimpFichier +from InterfaceGUI.QT5.monWidgetSimpBase import MonWidgetSimpBase class MonWidgetSimpFichier(Ui_WidgetSimpFichier, MonWidgetSimpBase): diff --git a/InterfaceGUI/QT5/monWidgetSimpSalome.py b/InterfaceGUI/QT5/monWidgetSimpSalome.py index c2e71721..7269aed9 100644 --- a/InterfaceGUI/QT5/monWidgetSimpSalome.py +++ b/InterfaceGUI/QT5/monWidgetSimpSalome.py @@ -23,10 +23,10 @@ from PyQt5.QtCore import Qt from Extensions.i18n import tr -from .feuille import Feuille -from desWidgetSimpSalome import Ui_WidgetSimpSalome -from .politiquesValidation import PolitiqueUnique -from .qtSaisie import SaisieValeur +from InterfaceGUI.QT5.feuille import Feuille +from UiQT5.desWidgetSimpSalome import Ui_WidgetSimpSalome +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.qtSaisie import SaisieValeur class MonWidgetSimpSalome(Ui_WidgetSimpSalome, Feuille): diff --git a/InterfaceGUI/QT5/monWidgetSimpTupleN.py b/InterfaceGUI/QT5/monWidgetSimpTupleN.py index 599b0caa..e82e2f13 100644 --- a/InterfaceGUI/QT5/monWidgetSimpTupleN.py +++ b/InterfaceGUI/QT5/monWidgetSimpTupleN.py @@ -19,21 +19,20 @@ # # Modules Eficas -# from PyQt4.QtGui import * -# from PyQt4.QtCore import * + from Extensions.i18n import tr from InterfaceGUI.QT5.feuille import Feuille from InterfaceGUI.QT5.monWidgetSimpTuple import MonWidgetSimpTuple -from desWidgetTuple2 import Ui_WidgetTuple2 -from desWidgetTuple3 import Ui_WidgetTuple3 -from desWidgetTuple4 import Ui_WidgetTuple4 -from desWidgetTuple5 import Ui_WidgetTuple5 -from desWidgetTuple6 import Ui_WidgetTuple6 -from desWidgetTuple7 import Ui_WidgetTuple7 -from desWidgetTuple8 import Ui_WidgetTuple8 -from desWidgetTuple9 import Ui_WidgetTuple9 -from desWidgetTuple10 import Ui_WidgetTuple10 +from UiQT5.desWidgetTuple2 import Ui_WidgetTuple2 +from UiQT5.desWidgetTuple3 import Ui_WidgetTuple3 +from UiQT5.desWidgetTuple4 import Ui_WidgetTuple4 +from UiQT5.desWidgetTuple5 import Ui_WidgetTuple5 +from UiQT5.desWidgetTuple6 import Ui_WidgetTuple6 +from UiQT5.desWidgetTuple7 import Ui_WidgetTuple7 +from UiQT5.desWidgetTuple8 import Ui_WidgetTuple8 +from UiQT5.desWidgetTuple9 import Ui_WidgetTuple9 +from UiQT5.desWidgetTuple10 import Ui_WidgetTuple10 class MonWidgetSimpTuple2(Ui_WidgetTuple2, MonWidgetSimpTuple): diff --git a/InterfaceGUI/QT5/monWidgetSimpTxt.py b/InterfaceGUI/QT5/monWidgetSimpTxt.py index 6a2c01dd..73ec34f7 100644 --- a/InterfaceGUI/QT5/monWidgetSimpTxt.py +++ b/InterfaceGUI/QT5/monWidgetSimpTxt.py @@ -21,8 +21,8 @@ # Modules Eficas from Extensions.i18n import tr -from desWidgetSimpTxt import Ui_WidgetSimpTxt -from .monWidgetSimpBase import MonWidgetSimpBase +from UiQT5.desWidgetSimpTxt import Ui_WidgetSimpTxt +from InterfaceGUI.QT5.monWidgetSimpBase import MonWidgetSimpBase class MonWidgetSimpTxt(Ui_WidgetSimpTxt, MonWidgetSimpBase): diff --git a/InterfaceGUI/QT5/monWidgetTableau.py b/InterfaceGUI/QT5/monWidgetTableau.py index 065c4d2f..e2bb395c 100644 --- a/InterfaceGUI/QT5/monWidgetTableau.py +++ b/InterfaceGUI/QT5/monWidgetTableau.py @@ -24,8 +24,8 @@ from PyQt5.QtCore import QSize from InterfaceGUI.QT5.feuille import Feuille from InterfaceGUI.QT5.monWidgetPlusieursTuple import MonWidgetPlusieursTuple -from desWidgetPlusieursTuple import Ui_WidgetPlusieursTuple -from desWidgetTableau import Ui_WidgetTableau +from UiQT5.desWidgetPlusieursTuple import Ui_WidgetPlusieursTuple +from UiQT5.desWidgetTableau import Ui_WidgetTableau maxLen = 3 diff --git a/InterfaceGUI/QT5/monWidgetUniqueSDCO.py b/InterfaceGUI/QT5/monWidgetUniqueSDCO.py index 3cf0c7f9..5dfc27b7 100644 --- a/InterfaceGUI/QT5/monWidgetUniqueSDCO.py +++ b/InterfaceGUI/QT5/monWidgetUniqueSDCO.py @@ -20,14 +20,13 @@ # Modules Python # Modules Eficas -from PyQt4.QtGui import * -from PyQt4.QtCore import * + from Extensions.i18n import tr -from .feuille import Feuille -from desWidgetUniqueSDCO import Ui_WidgetUniqueSDCO -from .politiquesValidation import PolitiqueUnique -from .qtSaisie import SaisieSDCO +from InterfaceGUI.QT5.feuille import Feuille +from UiQT5.desWidgetUniqueSDCO import Ui_WidgetUniqueSDCO +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.qtSaisie import SaisieSDCO class MonWidgetUniqueSDCO(Ui_WidgetUniqueSDCO, Feuille, SaisieSDCO): diff --git a/InterfaceGUI/QT5/monWidgetVide.py b/InterfaceGUI/QT5/monWidgetVide.py index 501d6cf8..7887b3ce 100644 --- a/InterfaceGUI/QT5/monWidgetVide.py +++ b/InterfaceGUI/QT5/monWidgetVide.py @@ -21,8 +21,8 @@ # Modules Eficas from Extensions.i18n import tr -from .feuille import Feuille -from desWidgetVide import Ui_WidgetVide +from InterfaceGUI.QT5.feuille import Feuille +from UiQT5.desWidgetVide import Ui_WidgetVide from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique diff --git a/InterfaceGUI/QT5/qtEficas.py b/InterfaceGUI/QT5/qtEficas.py index e0625329..365c9277 100755 --- a/InterfaceGUI/QT5/qtEficas.py +++ b/InterfaceGUI/QT5/qtEficas.py @@ -42,16 +42,8 @@ class Appli(AppliSsIhm, Ui_Eficas, QMainWindow): Class implementing the main user interface. """ - def __init__( - self, - code=None, - salome=1, - parent=None, - multi=False, - langue="en", - ssIhm=False, - labelCode=None, - GUIPath="InterfaceGUI.QT5", + def __init__( self, code=None, salome=1, parent=None, multi=False, langue="en", ssIhm=False, + labelCode=None, GUIPath="InterfaceGUI.QT5", ): """ Constructor @@ -831,22 +823,22 @@ class Appli(AppliSsIhm, Ui_Eficas, QMainWindow): pass def traductionV11V12(self): - from .gereTraduction import traduction + from InterfaceGUI.QT5.gereTraduction import traduction traduction(self.maConfiguration.repIni, self.viewmanager, "V11V12") def traductionV10V11(self): - from .gereTraduction import traduction + from InterfaceGUI.QT5.gereTraduction import traduction traduction(self.maConfiguration.repIni, self.viewmanager, "V10V11") def traductionV9V10(self): - from .gereTraduction import traduction + from InterfaceGUI.QT5.gereTraduction import traduction traduction(self.maConfiguration.repIni, self.viewmanager, "V9V10") def version(self): - from .monVisu import DVisu + from InterfaceGUI.QT5.monVisu import DVisu titre = tr("version ") monVisuDialg = DVisu(parent=self, fl=0) @@ -929,7 +921,7 @@ class Appli(AppliSsIhm, Ui_Eficas, QMainWindow): monOption.show() def optionPdf(self): - from monOptionsPdf import OptionPdf + from InterfaceGUI.QT5.monOptionsPdf import OptionPdf monOption = OptionPdf(parent=self, modal=0, configuration=self.maConfiguration) monOption.show() @@ -1098,7 +1090,7 @@ class Appli(AppliSsIhm, Ui_Eficas, QMainWindow): return if not hasattr(self, "readercata"): return - from monLayoutBouton import MonLayoutBouton + from InterfaceGUI.QT5.monLayoutBouton import MonLayoutBouton if hasattr(self, "monLayoutBoutonRempli"): return diff --git a/InterfaceGUI/QT5/ssIhm.py b/InterfaceGUI/QT5/ssIhm.py index 103c10a8..5f4b0b6a 100644 --- a/InterfaceGUI/QT5/ssIhm.py +++ b/InterfaceGUI/QT5/ssIhm.py @@ -18,10 +18,7 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # # permet de lancer EFICAS en n affichant rien -try: - from builtins import object -except: - pass + class appliEficasSSIhm(object): diff --git a/InterfaceGUI/QT5/typeNode.py b/InterfaceGUI/QT5/typeNode.py index a23f377c..a5ef21d5 100644 --- a/InterfaceGUI/QT5/typeNode.py +++ b/InterfaceGUI/QT5/typeNode.py @@ -19,10 +19,6 @@ # -try: - from builtins import object -except: - pass from PyQt5.QtWidgets import QAction, QMenu, QMessageBox diff --git a/InterfaceGUI/QT5/viewManager.py b/InterfaceGUI/QT5/viewManager.py index c4ea4e56..00b819a1 100644 --- a/InterfaceGUI/QT5/viewManager.py +++ b/InterfaceGUI/QT5/viewManager.py @@ -20,12 +20,6 @@ -try: - from builtins import str - from builtins import object -except: - pass - import os from Extensions.i18n import tr from PyQt5.QtWidgets import QFileDialog, QMessageBox -- 2.39.2