chgt des imports

diff --git a/InterfaceGUI/QT5/browser.py b/InterfaceGUI/QT5/browser.py
index fba2d7831ee46cc5279e34482c83a937f6f89194..694e11031c0cdfdeddc696e986ccdec6eea3d0ef 100644 (file)
--- 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 b3cc9313ab2503fe9033d3345eeadfca6bdea0a4..ef27814c779aeb022bdf033a8b0757e5cba8b803 100644 (file)
--- 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 635d176f74b5726e63babe3c31dbff945e709dd2..928352f1a8afef7b83c380bdd439e246fe775065 100644 (file)
--- 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 88f9338b4d6ee8cf4cd9bc44e490723686014d42..ccadc0ca4173dde0d5b2e3010c618612711c040f 100644 (file)
--- 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 9a47509524bf24cf12737fa1183f7a09decdd25b..1c3fd83d2fcfdf91c840a53c9ffcade7caa6b174 100644 (file)
--- 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 f14e78b81c3a62703dbac61e8f382cb9105e74dc..fcd50627d5698e8097871ab406911286ef4f629d 100644 (file)
--- 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 2d16f1a897dfc0ca0d7b31e1e09c89dc6317750f..a1f2acafb8dd7c07402d21a7f2e893ca9d800a54 100644 (file)
--- 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 5a4e8b3d3a57f79958ba4e08a13c5391987b5b6d..317344830b71f0255263989a8824e59dceae7516 100644 (file)
--- 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 fb80c1007f55915efa55af8c7eee0293ad5d7eb6..91f11940f425eaf7020b3f02a56e9ff7d796e949 100644 (file)
--- 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 009cbf6ad7750ffc66e85caf745631b33468a632..8abc01d40e134b9f02d2e259e843c9c42caaee4b 100644 (file)
--- 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 39a3cb6026a2e01906052de7ed59a733314a8d50..fbf0e3fb158ac8abe400ead9e50e83143ad7ffe4 100644 (file)
--- 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 2f590b68326d0b86fce9593833cea1ab5e316010..e23ed50293ab926b91ef602fa4d90cd869f203c5 100644 (file)
--- 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 51bea6bde62b3a321c9469233363bbc7d9bfca2a..aa7b61600af2906589f38d3174484976d538c32d 100644 (file)
--- 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 f19e36359a497af02c0b89cacb235c851841ce78..8efd3ea89a4235c8047a8891967b886084b2008d 100755 (executable)
--- 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 104e8266e890686ff34afa6c0f94cc85ac364918..8e69bb2ba682a96d919bec6a9fea86d77829f166 100644 (file)
--- 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 320e93d7094aa65ac10299af7d07f83eac3b512e..4237536967ba6b29b4966af1692b2b693eeef95d 100644 (file)
--- 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 466fe50c59eba694d4dec37dd346a41fad42a95b..079e50cba79c9fc9207f6ce0d4594836c25cedb3 100644 (file)
--- 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 69e809b839e4a57b980b6d740aca1188da127ee7..6a3321d4c9dbb17b7d6124d9cb343ec0e05a438b 100644 (file)
--- 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 208d7422e99661afc1fb59d02d59342a2065a1e5..274ee609af22f21516e2a586cfc5e34d064af1e9 100644 (file)
--- 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 576ec399cefda5343e4e5957741bc6b9aee4953b..5b12bd8589d867ceea32e5e6efb7ef0237dfb51b 100644 (file)
--- 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 585baa887a5da5926c7831ae70e8f9bc2ea61b0e..99800dbbcbe3cd31c4115811dccb4a56bb21df61 100644 (file)
--- 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 f6068395dc69ff99b7bde0fc442f70cfc336198b..7a8f3db80687d21b96b0b2c9c7d97eb59bd6107f 100644 (file)
--- 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 997c937078547d24346d48a233422c6a049db852..55e060f3215279f7da9ffc851299547307be1fcd 100644 (file)
--- 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 0b7c815fbb3a1ff9873002d492e1bc8b3490c95e..29981ba9eefe9b5da21b3ba3192b70cb009655b5 100644 (file)
--- 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 c3ca96ad4193ad76c998c2baa101abd95c125edf..d29dc8a2c34d16c241d7ceda739331756d60ff0c 100644 (file)
--- 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 00cdc5ce63b0fea0849bd9ae9ef75d75d7e8fb43..4f60f3e068ceab8c2c0a15898497e76c309e3a79 100644 (file)
--- 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 b4823568b3a6fc4a333a96aa093607f214b8e74d..0fc0b0e8535ae8327938e4b3d38bf28a95b1105e 100644 (file)
--- 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 8682ac55567207df9985fdd87049c6573b8a8277..3182b44e57e378482cec5192b0b8049e487a4227 100644 (file)
--- 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 ad953ea1225f5ace77c1102d5e3160fd57905737..d3f2ce2a222a953e1ff76bfcda33f58db7e9bf3f 100644 (file)
--- 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 dcac74194c5d400d3120c8aa0f2980c1c939e58c..abc41171946130b56e76dbcde845e35b9196fbda 100644 (file)
--- 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 671ce6aac38f6a5147754b8edf22e10542638efe..cbb2978712f0e36bb88d6bf50a22e2389cf5d1c5 100644 (file)
--- 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 0264b57832650bb1981db8f8a7109e64972d35b5..c5ba001391b75b3afcd67cd2f3138640e8414391 100644 (file)
--- 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 8ed8257a8df7855b9efd1f2640e94c7ade26a05c..8c0bc7dfa259ee0e036388c19b59d4372196698a 100644 (file)
--- 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 e3d29ec603556a4183af847681d95ba1d533027d..da6e5df81a4ead292df3ab50d75b9057ecd4dd7f 100644 (file)
--- 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 a45410cefa9b760b82a3612232d0a61cba6c2adc..7f3c786e40856a5b1f1829bf02ba55f05e7316a3 100644 (file)
--- 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 7c685fa4618e98a6dbad40ad2ff7e74d5ba2875e..c9edb4279b4aa73edd2d7f091fed2314f8e03d5c 100644 (file)
--- 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 6fc2582629e083fedc6aa70c5eec779df75282aa..607d8c0877772599f8a7ef41e7592caeb2a4aa30 100644 (file)
--- 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 df793c1327b0467e366bc30bdd2e8da0197b6f61..ed8d47b3b056b3e6ec25171a073d8ac014aac92b 100644 (file)
--- 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 763689301dd005bbcdde3fceca6f50e2d65d880e..75d0347577af7fb051760cbf6d01482383aa2485 100644 (file)
--- 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 13b0b05ac3987bbbcdea546e632a862298fd05ca..2a668933861a99f0fffb6318fede378cb728dcb2 100644 (file)
--- 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 97c048cbff89290fc2994ba982d4c41b530bb772..264a836fbf53be79c1fc6e9f32efbffe4353998c 100644 (file)
--- 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 70b7d2dc5c892a13820b3049107789e2696ea424..f1add8419abbb4bfa71e62e4b29042d7e1aa0f00 100644 (file)
--- 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 40a475f92c508ff2db3dd643b247b6b5be457ae8..4be5fbad0dd75f8b268a532ce740bd96509ce6b8 100644 (file)
--- 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 d9868e9fbf84476ec9497975412b9b31a2dbd1e8..26f70427f9c2d5d7d24ccd8ac3a2568c659b316a 100644 (file)
--- 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 91a55b6389ecdbcfa8c0128045c7bd2eb09d9503..137f60f30ac25934bdb71777cead70eda872acfb 100644 (file)
--- 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 ab795b9e950738dff5a1cb93cd1f1254f6028c7f..e342376f744e8d3ea04e5d4d5a2240ca323a87f7 100644 (file)
--- 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 25a585dfe7a899c7241a4543c505136893346a17..1dbc759c1934d4f5a169b7a412b5c59c685c7600 100644 (file)
--- 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 590d0128e84d97b8af41844616eb546b5a4e6f07..90d13a470475ff57b1c42557d094827aeab80ce2 100644 (file)
--- 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 0c311e369502c57ed39f37669b6cc01fd5aa6478..cba1ab495c8e96323332bd20810a1ea54d599f0f 100644 (file)
--- 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 44c30cc352a33990961061c58e73bcd754e5fb75..29dc2d87df68ce1a467ef74bae1135c29dda55d5 100644 (file)
--- 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 9bf49af87024fb54338cd8f4a9fb2427375577fd..93dd4a70d7cee9f9b85989fc7b9c7a365037ff08 100644 (file)
--- 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 ada2e67a364748c250eced634b105c4fe0796932..5c11d520fc156854339c8e9ba1dadcecdd1cef73 100644 (file)
--- 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 c809594357f2368c28b30b197e3ece0b8b364a56..ae3c5e84aa18de7d122d403cec9862bfff75287a 100644 (file)
--- 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 8655294ed12410dfc9abec247dd7c40f29e6a479..d66877a185ad9aa904bac85ea91efc90e39c7571 100644 (file)
--- 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 78266de17c6b01c05f6ba8c0cae761aadbde3932..acbbb5ef19db87795f1aa270d99214fa2c227950 100644 (file)
--- 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 f5162bc5141a965ca8f0b5a814d06c23e4f5f021..c45fa9184d6ce7b6d830d22830d2e1860a9c2f4b 100644 (file)
--- 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 5514652c135e7f97f95f6f750f1b82dc808065d3..4829d0c8c43ba8fc1f602ec98bcc8e3cc9426b0a 100644 (file)
--- 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 c4230965c8b83688b024c4d336b923552cc4d62e..f2c4d7ba21e16545c67e85966901b048971e7999 100644 (file)
--- 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 81e6923641737c8ed25cf8687a0a6f2697c26628..6470fe13e0b6b21650daaefce79268554e2ed777 100644 (file)
--- 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 6eddb2c37098338ffb2b5b78959aef8724108eb2..868044ecebeef392cbbd397224d2d38e5daed290 100644 (file)
--- 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 0206b59758c53e85e82eac2c984b625c9039f047..e9d36e406948cedd0e9cd2e74c33b10bfb7e20af 100644 (file)
--- 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 f519bb49c00e84a79849308e6d480d4b53d3b4fd..d18e337cf408de7c37085e9a3a9256084c1a13a0 100644 (file)
--- 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 4ec571937dda10a15b652941de5d56da4745d353..621357ea60796c3ae5467e7426fa1d5991c69fb7 100644 (file)
--- 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 a718ea44c5680146d07ddf0ff1a9553e6a3058b8..00e84b9234fc2ab3316058b173ca5b57b0bd9571 100644 (file)
--- 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 b80b41de36e7e41d234a1bb35bb9484d4908803c..24c855576a5c1083af241cb02f11161d50e9a66f 100644 (file)
--- 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 6c4ebbfa7b00963ff2c466340ffdda5ce9acae13..db827bfca1923409d3f1ba7cc8e1364ede73b06a 100644 (file)
--- 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 956ec5828e585d88751ab61ac036ffc1758ebfda..71c912a13e3f0b8d46ce7d0d87ce07210b419f5a 100644 (file)
--- 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 c456df057ec7a670ce409d96b71e33cf366d021c..5ef13e48b4b586884801b9c47697e191cd291f8d 100644 (file)
--- 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 c2e71721597b5db12a5cc4593f4a3392b25d2303..7269aed9414cdf6c181923a03f94c34cc72e8812 100644 (file)
--- 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 599b0caaedaeb47d12a1a97498b529a7f18b9dd6..e82e2f13dc419309f9f37ebcef22dc0aacf44fc3 100644 (file)
--- 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 6a2c01dd961f3419f0d4454f34445606b31f7602..73ec34f7649c4fcf4f758e5fa77df9ff9c12c85f 100644 (file)
--- 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 065c4d2f2b4a2ef12e8335773bdf64859751a387..e2bb395c58b8de62d16c0f9e67eca6541ab2c4d4 100644 (file)
--- 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 3cf0c7f97532e876a896bdee50ce40702d4b2ae6..5dfc27b7b8a8ee745819c200c4b5d87a41b57dc9 100644 (file)
--- 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 501d6cf86c0aadbbc615cec490e65e2176f57326..7887b3cefee6060d954e7399adc5cc5470016e07 100644 (file)
--- 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 e06253292242a4180af96d21c8b569e28f4009bf..365c92778d46a5b897af3a8dfa69554753c1ee34 100755 (executable)
--- 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 103c10a870dc219f0ffbcd22a995fedc97c0af42..5f4b0b6a96e0d69916bcb269788afb8ece3a9cad 100644 (file)
--- 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 a23f377ce1a5da34a59e6dc3900539532c9c0665..a5ef21d59a6ad80be0b72a411be4e668a8456f28 100644 (file)
--- 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 c4ea4e5610b6e89ce374db84fac7317da5bccd31..00b819a1b813000c82caabd97d9a54533a724c47 100644 (file)
--- 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