From 50dbfb4ea5b9d4c162942330965ccf1d26ad49b0 Mon Sep 17 00:00:00 2001 From: PASCALE NOYRET Date: Mon, 11 Dec 2023 16:01:51 +0100 Subject: [PATCH] premiers chgts de directory --- Editeur/comploader.py | 2 +- {InterfaceQT4 => Editeur}/eficas_go.py | 53 ++------ Extensions/acquiertGroupes.py | 123 ++++++++++++++++++ InterfaceGUI/.a.swp | Bin 0 -> 12288 bytes .../QT5}/__init__.py | 0 {InterfaceQT4 => InterfaceGUI/QT5}/browser.py | 34 ++--- .../QT5}/compobloc.py | 0 .../QT5}/compocomm.py | 0 .../QT5}/compocommandecomm.py | 0 .../QT5}/compofact.py | 10 +- .../QT5}/compoformule.py | 0 .../QT5}/compojdc.py | 0 .../QT5}/compomacro.py | 6 +- .../QT5}/compomclist.py | 8 +- .../QT5}/compooper.py | 0 .../QT5}/compoparam.py | 0 .../QT5}/compoproc.py | 0 .../QT5}/composimp.py | 84 ++++++------ .../QT5}/configuration.py | 0 {InterfaceQT4 => InterfaceGUI/QT5}/editor.py | 8 +- {InterfaceQT4 => InterfaceGUI/QT5}/feuille.py | 0 .../QT5}/gereIcones.py | 0 .../QT5}/gereListe.py | 2 +- .../QT5}/gereListeAvril11.py | 2 +- .../QT5}/gereRegles.py | 0 .../QT5}/gereTraduction.py | 0 {InterfaceQT4 => InterfaceGUI/QT5}/groupe.py | 0 .../QT5}/monBoutonValide.py | 0 .../QT5}/monChoixCata.py | 0 .../QT5}/monChoixCode.py | 0 .../QT5}/monChoixCommande.py | 0 .../QT5}/monChoixLangue.py | 0 .../QT5}/monFonctionPanel.py | 0 .../QT5}/monGroupeOptionnel.py | 0 .../QT5}/monLabelClic.py | 0 .../QT5}/monLayoutBouton.py | 0 .../QT5}/monRecherche.py | 0 .../QT5}/monRechercheCatalogue.py | 0 .../QT5}/monSelectVal.py | 0 .../QT5}/monViewRegles.py | 0 .../QT5}/monViewTexte.py | 0 {InterfaceQT4 => InterfaceGUI/QT5}/monVisu.py | 0 .../QT5}/monWidget4a6RadioButton.py | 0 .../QT5}/monWidget4a6RadioButtonSD.py | 0 .../QT5}/monWidgetBloc.py | 0 .../QT5}/monWidgetCB.py | 6 +- .../QT5}/monWidgetCBIntoSug.py | 0 .../QT5}/monWidgetCBSD.py | 0 .../QT5}/monWidgetCommande.py | 0 .../QT5}/monWidgetCommandeDeplie1Niveau.py | 2 +- .../QT5}/monWidgetCommentaire.py | 0 .../QT5}/monWidgetCreeParam.py | 0 .../QT5}/monWidgetCreeUserAssd.py | 0 .../QT5}/monWidgetDate.py | 0 .../QT5}/monWidgetFact.py | 0 .../QT5}/monWidgetFactPlie.py | 0 .../QT5}/monWidgetFormule.py | 0 .../QT5}/monWidgetHeure.py | 0 .../QT5}/monWidgetInactif.py | 0 .../QT5}/monWidgetInfo.py | 0 .../QT5}/monWidgetIntoSug.py | 0 .../QT5}/monWidgetMatrice.py | 0 .../QT5}/monWidgetNiveauFact.py | 6 +- .../QT5}/monWidgetOptionnel.py | 0 .../QT5}/monWidgetParam.py | 2 +- .../QT5}/monWidgetPlusieursASSDIntoOrdonne.py | 0 .../QT5}/monWidgetPlusieursBase.py | 12 +- .../QT5}/monWidgetPlusieursCreeUserAssd.py | 0 .../QT5}/monWidgetPlusieursInto.py | 10 +- .../QT5}/monWidgetPlusieursIntoOrdonne.py | 0 .../QT5}/monWidgetPlusieursPlie.py | 0 .../QT5}/monWidgetPlusieursTuple.py | 10 +- .../QT5}/monWidgetPlusieursTupleN.py | 0 .../QT5}/monWidgetRadioButton.py | 0 .../QT5}/monWidgetSDCOInto.py | 0 .../QT5}/monWidgetSimpBase.py | 0 .../QT5}/monWidgetSimpBool.py | 0 .../QT5}/monWidgetSimpComplexe.py | 0 .../QT5}/monWidgetSimpFichier.py | 0 .../QT5}/monWidgetSimpSalome.py | 0 .../QT5}/monWidgetSimpTuple.py | 6 +- .../QT5}/monWidgetSimpTupleN.py | 4 +- .../QT5}/monWidgetSimpTxt.py | 0 .../QT5}/monWidgetTableau.py | 4 +- .../QT5}/monWidgetUniqueSDCO.py | 0 .../QT5}/monWidgetVide.py | 2 +- .../QT5}/politiquesValidation.py | 0 .../QT5}/qtEficas.py | 24 ++-- .../QT5}/qtSaisie.py | 0 {InterfaceQT4 => InterfaceGUI/QT5}/ssIhm.py | 0 .../QT5}/typeNode.py | 0 .../QT5}/viewManager.py | 2 +- InterfaceGUI/__init__.py | 23 ++++ InterfaceGUI/a | 4 + {InterfaceQT4 => InterfaceGUI}/editorSsIhm.py | 6 +- {InterfaceQT4 => InterfaceGUI}/getVersion.py | 0 .../qtEficasSsIhm.py | 9 +- {InterfaceQT4 => InterfaceGUI}/readercata.py | 2 +- .../readercataXML.py | 6 +- .../viewManagerSsIhm.py | 12 +- 100 files changed, 295 insertions(+), 189 deletions(-) rename {InterfaceQT4 => Editeur}/eficas_go.py (90%) create mode 100755 Extensions/acquiertGroupes.py create mode 100644 InterfaceGUI/.a.swp rename {InterfaceQT4 => InterfaceGUI/QT5}/__init__.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/browser.py (98%) rename {InterfaceQT4 => InterfaceGUI/QT5}/compobloc.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/compocomm.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/compocommandecomm.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/compofact.py (94%) rename {InterfaceQT4 => InterfaceGUI/QT5}/compoformule.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/compojdc.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/compomacro.py (98%) rename {InterfaceQT4 => InterfaceGUI/QT5}/compomclist.py (96%) rename {InterfaceQT4 => InterfaceGUI/QT5}/compooper.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/compoparam.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/compoproc.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/composimp.py (91%) rename {InterfaceQT4 => InterfaceGUI/QT5}/configuration.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/editor.py (99%) rename {InterfaceQT4 => InterfaceGUI/QT5}/feuille.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/gereIcones.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/gereListe.py (99%) rename {InterfaceQT4 => InterfaceGUI/QT5}/gereListeAvril11.py (99%) rename {InterfaceQT4 => InterfaceGUI/QT5}/gereRegles.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/gereTraduction.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/groupe.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monBoutonValide.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monChoixCata.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monChoixCode.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monChoixCommande.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monChoixLangue.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monFonctionPanel.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monGroupeOptionnel.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monLabelClic.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monLayoutBouton.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monRecherche.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monRechercheCatalogue.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monSelectVal.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monViewRegles.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monViewTexte.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monVisu.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidget4a6RadioButton.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidget4a6RadioButtonSD.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetBloc.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetCB.py (96%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetCBIntoSug.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetCBSD.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetCommande.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetCommandeDeplie1Niveau.py (98%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetCommentaire.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetCreeParam.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetCreeUserAssd.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetDate.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetFact.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetFactPlie.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetFormule.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetHeure.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetInactif.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetInfo.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetIntoSug.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetMatrice.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetNiveauFact.py (97%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetOptionnel.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetParam.py (98%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetPlusieursASSDIntoOrdonne.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetPlusieursBase.py (97%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetPlusieursCreeUserAssd.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetPlusieursInto.py (97%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetPlusieursIntoOrdonne.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetPlusieursPlie.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetPlusieursTuple.py (98%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetPlusieursTupleN.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetRadioButton.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetSDCOInto.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetSimpBase.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetSimpBool.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetSimpComplexe.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetSimpFichier.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetSimpSalome.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetSimpTuple.py (95%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetSimpTupleN.py (97%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetSimpTxt.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetTableau.py (94%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetUniqueSDCO.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/monWidgetVide.py (95%) rename {InterfaceQT4 => InterfaceGUI/QT5}/politiquesValidation.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/qtEficas.py (98%) rename {InterfaceQT4 => InterfaceGUI/QT5}/qtSaisie.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/ssIhm.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/typeNode.py (100%) rename {InterfaceQT4 => InterfaceGUI/QT5}/viewManager.py (99%) create mode 100644 InterfaceGUI/__init__.py create mode 100644 InterfaceGUI/a rename {InterfaceQT4 => InterfaceGUI}/editorSsIhm.py (99%) rename {InterfaceQT4 => InterfaceGUI}/getVersion.py (100%) rename {InterfaceQT4 => InterfaceGUI}/qtEficasSsIhm.py (97%) rename {InterfaceQT4 => InterfaceGUI}/readercata.py (99%) rename {InterfaceQT4 => InterfaceGUI}/readercataXML.py (95%) rename {InterfaceQT4 => InterfaceGUI}/viewManagerSsIhm.py (97%) diff --git a/Editeur/comploader.py b/Editeur/comploader.py index 414fda56..7c9e7941 100644 --- a/Editeur/comploader.py +++ b/Editeur/comploader.py @@ -45,7 +45,7 @@ def chargerComposants(GUIPath): et de remplir le dictionnaire composants utilise par makeObjecttreeitem """ debug = 0 - repertoire = os.path.join("..", GUIPath) + repertoire = os.path.join("..", "Interface",GUIPath) package = GUIPath listfich = glob.glob(os.path.join(repertoire, "compo*.py")) for fichier in listfich: diff --git a/InterfaceQT4/eficas_go.py b/Editeur/eficas_go.py similarity index 90% rename from InterfaceQT4/eficas_go.py rename to Editeur/eficas_go.py index 54c04220..3498d2a7 100755 --- a/InterfaceQT4/eficas_go.py +++ b/Editeur/eficas_go.py @@ -9,7 +9,6 @@ # # This library is distributed in the hope that it will be useful, # but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU # Lesser General Public License for more details. # # You should have received a copy of the GNU Lesser General Public @@ -24,26 +23,16 @@ import sys, os repIni = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..")) -ihmQTDir = os.path.join(repIni, "UiQT5") -editeurDir = os.path.join(repIni, "Editeur") -ihmDir = os.path.join(repIni, "InterfaceQT4") - -if ihmDir not in sys.path: - sys.path.append(ihmDir) -if ihmQTDir not in sys.path: - sys.path.append(ihmQTDir) -if editeurDir not in sys.path: - sys.path.append(editeurDir) if sys.version_info[0] < 3: print("Must be using Python 3") sys.exit() -def lanceEficas(code=None, multi=False, langue="en", labelCode=None): - # ------------------------------------------------------------------- +def lanceEficas(code=None, multi=False, langue="en", labelCode=None, GUI='QT5', salome=0): +# --------------------------------------------------------------------------------------- """ - Lance l'appli EFICAS avec Ihm + Lance l'appli EFICAS avec Ihm QT """ try: from PyQt5.QtWidgets import QApplication @@ -57,30 +46,22 @@ def lanceEficas(code=None, multi=False, langue="en", labelCode=None): if options.code != None: code = options.code - from InterfaceQT4.qtEficas import Appli + pathGui='InterfaceGUI.QT5.qtEficas' + qtEficas =__import__(pathGui, globals(), locals(), ['qtEficas',]) app = QApplication(sys.argv) - - Eficas = Appli(code=code, salome=0, multi=multi, langue=langue, labelCode=labelCode) + Eficas = qtEficas.Appli(code=code, salome=salome, multi=multi, langue=langue, labelCode=labelCode, GUI=GUI) Eficas.show() res = app.exec_() sys.exit(res) -def getEficasSsIhm( - code=None, - multi=False, - langue="en", - ssCode=None, - labelCode=None, - forceXML=False, - genereXSD=False, - fichierCata=None, -): - # ------------------------------------------------------------------------------------------------------------------------- +def getEficasSsIhm( code=None, multi=False, langue="en", ssCode=None, labelCode=None, + forceXML=False, genereXSD=False, fichierCata=None,): +# ----------------------------------------------------------------------------------- """ - Lance l'appli EFICAS sans Ihm + instancie l'appli EFICAS sans Ihm """ from Editeur import session @@ -92,21 +73,13 @@ def getEficasSsIhm( from InterfaceQT4.qtEficasSsIhm import AppliSsIhm - Eficas = AppliSsIhm( - code=code, - salome=0, - multi=multi, - langue=langue, - ssCode=ssCode, - labelCode=labelCode, - genereXSD=genereXSD, - fichierCata=fichierCata, - ) + Eficas = AppliSsIhm( code=code, salome=0, multi=multi, langue=langue, + ssCode=ssCode, labelCode=labelCode, genereXSD=genereXSD, fichierCata=fichierCata,) return Eficas def genereXSD(code=None): - # ------------------------ +# ----------------------- from Editeur import session options = session.parse(sys.argv) diff --git a/Extensions/acquiertGroupes.py b/Extensions/acquiertGroupes.py new file mode 100755 index 00000000..35eb0918 --- /dev/null +++ b/Extensions/acquiertGroupes.py @@ -0,0 +1,123 @@ +#! /usr/bin/env python +# -*- coding:utf-8 -*- +# /* This file is part of MED. +# * +# * COPYRIGHT (C) 1999 - 2013 EDF R&D, CEA/DEN +# * MED is free software: you can redistribute it and/or modify +# * it under the terms of the GNU Lesser General Public License as published by +# * the Free Software Foundation, either version 3 of the License, or +# * (at your option) any later version. +# * +# * MED is distributed in the hope that it will be useful, +# * but WITHOUT ANY WARRANTY; without even the implied warranty of +# * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# * GNU Lesser General Public License for more details. +# * +# * You should have received a copy of the GNU Lesser General Public License +# * along with MED. If not, see . +# */ + + +import sys +sys.path.append('/home/A96028/Salome/V7_main/tools/install/Medfichier-307-hdf51810/lib/python2.7/site-packages') + +from med.medfile import * +from med.medmesh import * +from med.medfamily import * +from med.medfilter import * + + +def getGroupes(filename,debug=0) : + listeGroupes=[] + maa="" + + dicoNumFam={} + + try : + fid = MEDfileOpen(filename,MED_ACC_RDONLY) + except : + return ("Pb a la lecture du fichier", listeGroupes,maa) + + + # /* Lecture des infos concernant le premier maillage */ + maa, sdim, mdim, type, desc, dtunit, sort, nstep, rep, nomcoo,unicoo = MEDmeshInfo(fid, 1) + if debug : + print "Maillage de nom : |%s| de dimension : %ld , et de type %s\n"%(maa,mdim,type) + print "Maillage de nom : |%s| , de dimension : %ld , et de type %s\n"%(maa,mdim,type) + print "\t -Dimension de l'espace : %ld\n"%(sdim) + print "\t -Description du maillage : %s\n"%(desc) + print "\t -Noms des axes : |%s|\n"%(nomcoo) + print "\t -Unités des axes : |%s|\n"%(unicoo) + print "\t -Type de repère : %s\n"%(rep) + print "\t -Nombre d'étape de calcul : %ld\n"%(nstep) + print "\t -Unité des dates : |%s|\n"%(dtunit) + + # /* Lecture du nombre de familles */ + nfam = MEDnFamily(fid,maa) + if debug : + print "Nombre de familles : %d \n"%(nfam) + + # /* Lecture de chaque famille */ + for i in xrange(0,nfam): + + # /* Lecture du nombre de groupe */ + ngro = MEDnFamilyGroup(fid,maa,i+1) + if debug : + print "Famille %d a %d groupes \n"%(i+1,ngro) + + gro = MEDCHAR(MED_LNAME_SIZE*ngro+1) + + nomfam,numfam,gro = MEDfamilyInfo(fid,maa,i+1,gro) + if debug : + print "Famille de nom %s et de numero %d : \n"%(nomfam,numfam) + print "Attributs : \n" + + for j in xrange(0,ngro): + # print "gro = %s\n"%(gro[j*MED_LNAME_SIZE:j*MED_LNAME_SIZE+MED_LNAME_SIZE]) + groupSplit=gro[j*MED_LNAME_SIZE:j*MED_LNAME_SIZE+MED_LNAME_SIZE] + groupeName="".join(groupSplit).split("\x00")[0] + groupeName=groupeName.replace(' ','') + if groupeName[0:7]=="CENTRE_" : dicoNumFam[groupeName]=numfam + if groupeName not in listeGroupes : listeGroupes.append(groupeName) + + + #print dicoNumFam + #print listeGroupes + + # /* Lecture des Numeros de Familles */ + + nnoe, chgt, trsf = MEDmeshnEntity(fid,maa,MED_NO_DT,MED_NO_IT, MED_NODE,MED_NONE,MED_COORDINATE,MED_NO_CMODE) + nufano = MEDINT(nnoe) + MEDmeshEntityFamilyNumberRd(fid,maa, MED_NO_DT, MED_NO_IT, MED_NODE,MED_NONE,nufano) + dicoNumNode={} + for groupe in dicoNumFam.keys(): + famille=dicoNumFam[groupe] + i=0 + while i < nufano.size(): + if nufano[i]==famille : + dicoNumNode[groupe]=i+1 + break + i=i+1 + + + #print dicoNumNode + dicoCoord={} + for groupe in dicoNumNode.keys() : + flt=MEDINT(1) + flt[0]=dicoNumNode[groupe] + coo1=MEDFLOAT(3) + filter=med_filter() + err=MEDfilterEntityCr( fid, nnoe, 1, sdim, MED_ALL_CONSTITUENT, MED_FULL_INTERLACE, MED_COMPACT_PFLMODE, MED_NO_PROFILE,1 , flt, filter) + MEDmeshNodeCoordinateAdvancedRd(fid, maa, MED_NO_DT, MED_NO_IT, filter, coo1) + MEDfilterClose(filter) + dicoCoord[groupe]=coo1 +# dicoCoord['CENTRE_saxBas']=(0,0,28.5e-3) +# dicoCoord['CENTRE_saxHaut']=(0,0,31.5e-3) + + MEDfileClose(fid) + return ("",listeGroupes,maa,dicoCoord) + +if __name__ == "__main__": + filename="/home/A96028/Carmel/Pascale/Domaine_Bidouille.med" + #filename="/home/A96028/Carmel/nouveauMed/Domaine.med" + print getGroupes(filename) diff --git a/InterfaceGUI/.a.swp b/InterfaceGUI/.a.swp new file mode 100644 index 0000000000000000000000000000000000000000..297cd885c5094280d7c50af5a934d16d3d9aafe0 GIT binary patch literal 12288 zcmeI&O-sWt7zgmwyKLyqQ>J)yeUaJfZA_7Z6?ArZjcuwGv(_|Iyy!{%T7C<^j%n92 z@KBhy>HmQcnmkFL{BEVWu_k^%y}mnv_E!VZ( zL3`fod_(i%YH-Y-OrE3>D*`TWx#>?8mkEpbY3Q4*eH+X|00PSj%v7@Ht%v)LZIw%R zwtIAQBV2YDN7OGQ9n2R3Lg=rLjVF0fB*y_ z009U<00Izz00jQM0E-EUI)r@aR{sBQzW+b#v2)#bb?cP#2nav`0uX=z1Rwwb2tWV= z5P-lR5s;k4Tt-Z>>)@=PzZ@kp6Lc|3Q;}y<(aS1tr1M6Z5VI+HR3}Ng$XjytuNPLY f)z|39g?}f?dg+g->K{frr73-W?|#f4GQr6=6QOnR literal 0 HcmV?d00001 diff --git a/InterfaceQT4/__init__.py b/InterfaceGUI/QT5/__init__.py similarity index 100% rename from InterfaceQT4/__init__.py rename to InterfaceGUI/QT5/__init__.py diff --git a/InterfaceQT4/browser.py b/InterfaceGUI/QT5/browser.py similarity index 98% rename from InterfaceQT4/browser.py rename to InterfaceGUI/QT5/browser.py index b9b3e5a6..fba2d783 100644 --- a/InterfaceQT4/browser.py +++ b/InterfaceGUI/QT5/browser.py @@ -154,7 +154,7 @@ class JDCTree(QTreeWidget, GereRegles): # ---------------------------------- # print ("je passe dans handleOnItem pour ",self, item.item.nom, item, item.item, item.item.getLabelText()) - from InterfaceQT4 import composimp + from InterfaceGUI.QT5 import composimp self.inhibeExpand = True self.itemCourant = item @@ -242,9 +242,9 @@ class JDCNode(QTreeWidgetItem, GereRegles): self.childrenComplete = [] self.item._object.node = self - from InterfaceQT4 import compocomm - from InterfaceQT4 import compoparam - from InterfaceQT4 import composimp + from InterfaceGUI.QT5 import compocomm + from InterfaceGUI.QT5 import compoparam + from InterfaceGUI.QT5 import composimp if isinstance(self.item, compocomm.COMMTreeItem): name = tr("Commentaire") @@ -286,8 +286,8 @@ class JDCNode(QTreeWidgetItem, GereRegles): if isinstance(self.item, composimp.SIMPTreeItem): self.plie = False - from InterfaceQT4 import compobloc - from InterfaceQT4 import compomclist + from InterfaceGUI.QT5 import compobloc + from InterfaceGUI.QT5 import compomclist ajoutAuParentduNoeud = 0 self.treeParent = treeParent @@ -432,7 +432,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): if self.fenetreIhm == None: return None if self.fenetreIhm == "deplie1Niveau": - from InterfaceQT4.monWidgetCommandeDeplie1Niveau import ( + from InterfaceGUI.QT5.monWidgetCommandeDeplie1Niveau import ( MonWidgetCommandeDeplie1Niveau, ) @@ -581,7 +581,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): """ self.editor.initModif() - from InterfaceQT4 import compojdc + from InterfaceGUI.QT5 import compojdc if (isinstance(self.treeParent, compojdc.Node)) and not self.verifiePosition( name, pos @@ -759,7 +759,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): else: toselect.select() - from InterfaceQT4 import compojdc + from InterfaceGUI.QT5 import compojdc # cas ou on detruit dans l arbre sans affichage if isinstance(self.treeParent, compojdc.Node): @@ -775,7 +775,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): """ Methode externe pour la destruction d une liste de noeud """ - from InterfaceQT4 import compojdc + from InterfaceGUI.QT5 import compojdc self.editor.initModif() index = 9999 @@ -1018,7 +1018,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): def plieToutEtReafficheSaufItem(self, itemADeplier): # --------------------------------------------------- self.inhibeExpand = True - from InterfaceQT4 import compojdc + from InterfaceGUI.QT5 import compojdc if isinstance(self, compojdc.Node): self.affichePanneau() @@ -1027,7 +1027,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): self.editor.deplier = False for item in self.children: # il ne faut pas plier les blocs - from InterfaceQT4 import compobloc + from InterfaceGUI.QT5 import compobloc if isinstance(item, compobloc.Node): continue @@ -1040,7 +1040,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): def plieToutEtReaffiche(self): # ----------------------------- # print ('plieToutEtReaffiche', self.item.getNom()) - from InterfaceQT4 import compojdc + from InterfaceGUI.QT5 import compojdc if isinstance(self, compojdc.Node): self.affichePanneau() @@ -1049,7 +1049,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): self.editor.deplier = False for item in self.children: # il ne faut pas plier les blocs - from InterfaceQT4 import compobloc + from InterfaceGUI.QT5 import compobloc if isinstance(item, compobloc.Node): continue @@ -1088,7 +1088,7 @@ class JDCNode(QTreeWidgetItem, GereRegles): def setPlieChildren(self): # ----------------------------- self.plie = True - from InterfaceQT4 import composimp + from InterfaceGUI.QT5 import composimp if isinstance(self, composimp.Node): return @@ -1103,8 +1103,8 @@ class JDCNode(QTreeWidgetItem, GereRegles): # Pour les blocs et les motcles list # on affiche un niveau de plus - from InterfaceQT4 import compobloc - from InterfaceQT4 import compomclist + from InterfaceGUI.QT5 import compobloc + from InterfaceGUI.QT5 import compomclist if isinstance(self, compobloc.Node) or ( isinstance(self, compomclist.Node) and self.item.isMCList() diff --git a/InterfaceQT4/compobloc.py b/InterfaceGUI/QT5/compobloc.py similarity index 100% rename from InterfaceQT4/compobloc.py rename to InterfaceGUI/QT5/compobloc.py diff --git a/InterfaceQT4/compocomm.py b/InterfaceGUI/QT5/compocomm.py similarity index 100% rename from InterfaceQT4/compocomm.py rename to InterfaceGUI/QT5/compocomm.py diff --git a/InterfaceQT4/compocommandecomm.py b/InterfaceGUI/QT5/compocommandecomm.py similarity index 100% rename from InterfaceQT4/compocommandecomm.py rename to InterfaceGUI/QT5/compocommandecomm.py diff --git a/InterfaceQT4/compofact.py b/InterfaceGUI/QT5/compofact.py similarity index 94% rename from InterfaceQT4/compofact.py rename to InterfaceGUI/QT5/compofact.py index 1756e769..9a475095 100644 --- a/InterfaceQT4/compofact.py +++ b/InterfaceGUI/QT5/compofact.py @@ -18,8 +18,8 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # -from InterfaceQT4 import browser -from InterfaceQT4 import typeNode +from InterfaceGUI.QT5 import browser +from InterfaceGUI.QT5 import typeNode from Extensions.i18n import tr from Editeur import Objecttreeitem @@ -38,7 +38,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodePartiel): else: self.niveau = 1 if hasattr(self, "plie") and self.plie == True: - from InterfaceQT4.monWidgetFactPlie import MonWidgetFactPlie + from InterfaceGUI.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 InterfaceQT4.monWidgetFactPlie import MonWidgetFactPlie + from InterfaceGUI.QT5.monWidgetFactPlie import MonWidgetFactPlie widget = MonWidgetFactPlie( self, @@ -64,7 +64,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodePartiel): maCommande, ) else: - from InterfaceQT4.monWidgetFact import MonWidgetFact + from InterfaceGUI.QT5.monWidgetFact import MonWidgetFact widget = MonWidgetFact( self, diff --git a/InterfaceQT4/compoformule.py b/InterfaceGUI/QT5/compoformule.py similarity index 100% rename from InterfaceQT4/compoformule.py rename to InterfaceGUI/QT5/compoformule.py diff --git a/InterfaceQT4/compojdc.py b/InterfaceGUI/QT5/compojdc.py similarity index 100% rename from InterfaceQT4/compojdc.py rename to InterfaceGUI/QT5/compojdc.py diff --git a/InterfaceQT4/compomacro.py b/InterfaceGUI/QT5/compomacro.py similarity index 98% rename from InterfaceQT4/compomacro.py rename to InterfaceGUI/QT5/compomacro.py index 5c8c9309..5a4e8b3d 100644 --- a/InterfaceQT4/compomacro.py +++ b/InterfaceGUI/QT5/compomacro.py @@ -27,9 +27,9 @@ import traceback # Modules Eficas from Editeur import Objecttreeitem from Extensions.i18n import tr -from InterfaceQT4 import compooper -from InterfaceQT4 import browser -from InterfaceQT4 import typeNode +from InterfaceGUI.QT5 import compooper +from InterfaceGUI.QT5 import browser +from InterfaceGUI.QT5 import typeNode class MACRONode(browser.JDCNode, typeNode.PopUpMenuNode): diff --git a/InterfaceQT4/compomclist.py b/InterfaceGUI/QT5/compomclist.py similarity index 96% rename from InterfaceQT4/compomclist.py rename to InterfaceGUI/QT5/compomclist.py index 3d60fd2a..fb80c100 100644 --- a/InterfaceQT4/compomclist.py +++ b/InterfaceGUI/QT5/compomclist.py @@ -47,7 +47,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): # attention si l objet est une mclist on utilise bloc if not (monObjet.isMCList()): if hasattr(self, "plie") and self.plie == True: - from InterfaceQT4.monWidgetFactPlie import MonWidgetFactPlie + from InterfaceGUI.QT5.monWidgetFactPlie import MonWidgetFactPlie widget = MonWidgetFactPlie( self, @@ -61,7 +61,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): elif self.editor.maConfiguration.afficheFirstPlies and self.firstAffiche: self.firstAffiche = False self.setPlie() - from InterfaceQT4.monWidgetFactPlie import MonWidgetFactPlie + from InterfaceGUI.QT5.monWidgetFactPlie import MonWidgetFactPlie widget = MonWidgetFactPlie( self, @@ -73,7 +73,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): maCommande, ) else: - from InterfaceQT4.monWidgetFact import MonWidgetFact + from InterfaceGUI.QT5.monWidgetFact import MonWidgetFact widget = MonWidgetFact( self, @@ -85,7 +85,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): maCommande, ) else: - from InterfaceQT4.monWidgetBloc import MonWidgetBloc + from InterfaceGUI.QT5.monWidgetBloc import MonWidgetBloc widget = MonWidgetBloc( self, diff --git a/InterfaceQT4/compooper.py b/InterfaceGUI/QT5/compooper.py similarity index 100% rename from InterfaceQT4/compooper.py rename to InterfaceGUI/QT5/compooper.py diff --git a/InterfaceQT4/compoparam.py b/InterfaceGUI/QT5/compoparam.py similarity index 100% rename from InterfaceQT4/compoparam.py rename to InterfaceGUI/QT5/compoparam.py diff --git a/InterfaceQT4/compoproc.py b/InterfaceGUI/QT5/compoproc.py similarity index 100% rename from InterfaceQT4/compoproc.py rename to InterfaceGUI/QT5/compoproc.py diff --git a/InterfaceQT4/composimp.py b/InterfaceGUI/QT5/composimp.py similarity index 91% rename from InterfaceQT4/composimp.py rename to InterfaceGUI/QT5/composimp.py index fbb0df20..51bea6bd 100644 --- a/InterfaceQT4/composimp.py +++ b/InterfaceGUI/QT5/composimp.py @@ -22,11 +22,11 @@ import types, os from copy import copy, deepcopy import traceback -from InterfaceQT4 import typeNode +from InterfaceGUI.QT5 import typeNode # Modules Eficas from Editeur import Objecttreeitem -from InterfaceQT4 import browser +from InterfaceGUI.QT5 import browser from Noyau.N_CR import justifyText from Accas import SalomeEntry from Accas import ASSD @@ -49,7 +49,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): return None # label informatif if monObjet.isInformation(): - from InterfaceQT4.monWidgetInfo import MonWidgetInfo + from InterfaceGUI.QT5.monWidgetInfo import MonWidgetInfo widget = MonWidgetInfo( self, maDefinition, monNom, monObjet, parentQt, maCommande @@ -62,7 +62,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): # a gerer comme dans composimp # Gestion des matrices if self.item.waitMatrice(): - from InterfaceQT4.monWidgetMatrice import MonWidgetMatrice + from InterfaceGUI.QT5.monWidgetMatrice import MonWidgetMatrice widget = MonWidgetMatrice( self, maDefinition, monNom, monObjet, parentQt, maCommande @@ -82,26 +82,26 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): if maDefinition.max == 1: # A verifier if maDefinition.intoSug != [] and maDefinition.intoSug != None: - from InterfaceQT4.monWidgetCBIntoSug import MonWidgetCBIntoSug + from InterfaceGUI.QT5.monWidgetCBIntoSug import MonWidgetCBIntoSug widget = MonWidgetCBIntoSug( self, maDefinition, monNom, monObjet, parentQt, maCommande ) elif maDefinition.into != [] and maDefinition.into != None: if maDefinition.fenetreIhm == "menuDeroulant": - from InterfaceQT4.monWidgetCB import MonWidgetCB + from InterfaceGUI.QT5.monWidgetCB import MonWidgetCB widget = MonWidgetCB( self, maDefinition, monNom, monObjet, parentQt, maCommande ) elif len(monInto) < 4: - from InterfaceQT4.monWidgetRadioButton import MonWidgetRadioButton + from InterfaceGUI.QT5.monWidgetRadioButton import MonWidgetRadioButton widget = MonWidgetRadioButton( self, maDefinition, monNom, monObjet, parentQt, maCommande ) elif len(monInto) < 7: - from InterfaceQT4.monWidget4a6RadioButton import ( + from InterfaceGUI.QT5.monWidget4a6RadioButton import ( MonWidget4a6RadioButton, ) @@ -109,20 +109,20 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): self, maDefinition, monNom, monObjet, parentQt, maCommande ) else: - from InterfaceQT4.monWidgetCB import MonWidgetCB + from InterfaceGUI.QT5.monWidgetCB import MonWidgetCB widget = MonWidgetCB( self, maDefinition, monNom, monObjet, parentQt, maCommande ) elif self.item.waitBool(): - from InterfaceQT4.monWidgetSimpBool import MonWidgetSimpBool + from InterfaceGUI.QT5.monWidgetSimpBool import MonWidgetSimpBool widget = MonWidgetSimpBool( self, maDefinition, monNom, monObjet, parentQt, maCommande ) elif self.item.waitFichier(): - from InterfaceQT4.monWidgetSimpFichier import MonWidgetSimpFichier + from InterfaceGUI.QT5.monWidgetSimpFichier import MonWidgetSimpFichier widget = MonWidgetSimpFichier( self, maDefinition, monNom, monObjet, parentQt, maCommande @@ -130,13 +130,13 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): # PNPNPN - a faire elif self.item.waitDate(): - from InterfaceQT4.monWidgetDate import MonWidgetDate + from InterfaceGUI.QT5.monWidgetDate import MonWidgetDate widget = MonWidgetDate( self, maDefinition, monNom, monObjet, parentQt, maCommande ) elif self.item.waitHeure(): - from InterfaceQT4.monWidgetHeure import MonWidgetHeure + from InterfaceGUI.QT5.monWidgetHeure import MonWidgetHeure widget = MonWidgetHeure( self, maDefinition, monNom, monObjet, parentQt, maCommande @@ -145,7 +145,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): elif self.item.waitTuple(): num = self.item.object.definition.type[0].ntuple nomDeLaClasse = "MonWidgetSimpTuple" + str(num) - nomDuFichier = "InterfaceQT4.monWidgetSimpTupleN" + nomDuFichier = "InterfaceGUI.QT5.monWidgetSimpTupleN" try: # if 1 : _temp = __import__( @@ -162,7 +162,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): ) elif self.item.waitComplex(): - from InterfaceQT4.monWidgetSimpComplexe import MonWidgetSimpComplexe + from InterfaceGUI.QT5.monWidgetSimpComplexe import MonWidgetSimpComplexe widget = MonWidgetSimpComplexe( self, maDefinition, monNom, monObjet, parentQt, maCommande @@ -170,13 +170,13 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): elif self.item.waitCo(): if len(self.item.getSdAvantDuBonType()) == 0: - from InterfaceQT4.monWidgetUniqueSDCO import MonWidgetUniqueSDCO + from InterfaceGUI.QT5.monWidgetUniqueSDCO import MonWidgetUniqueSDCO widget = MonWidgetUniqueSDCO( self, maDefinition, monNom, monObjet, parentQt, maCommande ) else: - from InterfaceQT4.monWidgetSDCOInto import MonWidgetSDCOInto + from InterfaceGUI.QT5.monWidgetSDCOInto import MonWidgetSDCOInto widget = MonWidgetSDCOInto( self, maDefinition, monNom, monObjet, parentQt, maCommande @@ -186,28 +186,28 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): if not (self.item.waitUserAssdOrAssdMultipleEnCreation()): maListe = self.item.getSdAvantDuBonType() if self.item.waitUserAssdOrAssdMultipleEnCreation(): - from InterfaceQT4.monWidgetCreeUserAssd import MonWidgetCreeUserAssd + from InterfaceGUI.QT5.monWidgetCreeUserAssd import MonWidgetCreeUserAssd widget = MonWidgetCreeUserAssd( self, maDefinition, monNom, monObjet, parentQt, maCommande ) # elif len(self.item.getSdAvantDuBonType()) == 0 : elif len(maListe) == 0: - from InterfaceQT4.monWidgetVide import MonWidgetVide + from InterfaceGUI.QT5.monWidgetVide import MonWidgetVide widget = MonWidgetVide( self, maDefinition, monNom, monObjet, parentQt, maCommande ) # elif len(self.item.getSdAvantDuBonType()) < 4 : elif len(maListe) < 4: - from InterfaceQT4.monWidgetRadioButton import MonWidgetRadioButtonSD + from InterfaceGUI.QT5.monWidgetRadioButton import MonWidgetRadioButtonSD widget = MonWidgetRadioButtonSD( self, maDefinition, monNom, monObjet, parentQt, maCommande ) # elif len(self.item.getSdAvantDuBonType()) < 7 : elif len(maListe) < 7: - from InterfaceQT4.monWidget4a6RadioButton import ( + from InterfaceGUI.QT5.monWidget4a6RadioButton import ( MonWidget4a6RadioButtonSD, ) @@ -215,27 +215,27 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): self, maDefinition, monNom, monObjet, parentQt, maCommande ) else: - from InterfaceQT4.monWidgetCB import MonWidgetCBSD + from InterfaceGUI.QT5.monWidgetCB import MonWidgetCBSD widget = MonWidgetCBSD( self, maDefinition, monNom, monObjet, parentQt, maCommande ) elif self.item.waitSalome() and self.editor.salome: - from InterfaceQT4.monWidgetSimpSalome import MonWidgetSimpSalome + from InterfaceGUI.QT5.monWidgetSimpSalome import MonWidgetSimpSalome widget = MonWidgetSimpSalome( self, maDefinition, monNom, monObjet, parentQt, maCommande ) elif self.item.waitTxm(): - from InterfaceQT4.monWidgetSimpTxt import MonWidgetSimpTxt + from InterfaceGUI.QT5.monWidgetSimpTxt import MonWidgetSimpTxt widget = MonWidgetSimpTxt( self, maDefinition, monNom, monObjet, parentQt, maCommande ) else: - from InterfaceQT4.monWidgetSimpBase import MonWidgetSimpBase + from InterfaceGUI.QT5.monWidgetSimpBase import MonWidgetSimpBase widget = MonWidgetSimpBase( self, maDefinition, monNom, monObjet, parentQt, maCommande @@ -247,13 +247,13 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): if self.item in self.editor.listeDesListesOuvertes or not ( self.editor.afficheListesPliees ): - from InterfaceQT4.monWidgetIntoSug import MonWidgetIntoSug + from InterfaceGUI.QT5.monWidgetIntoSug import MonWidgetIntoSug widget = MonWidgetIntoSug( self, maDefinition, monNom, monObjet, parentQt, maCommande ) else: - from InterfaceQT4.monWidgetPlusieursPlie import ( + from InterfaceGUI.QT5.monWidgetPlusieursPlie import ( MonWidgetPlusieursPlie, ) @@ -265,13 +265,13 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): elif self.item.waitAssd() and self.item.isListSansOrdreNiDoublon(): listeAAfficher = self.item.getSdAvantDuBonType() if len(listeAAfficher) == 0: - from InterfaceQT4.monWidgetVide import MonWidgetVide + from InterfaceGUI.QT5.monWidgetVide import MonWidgetVide widget = MonWidgetVide( self, maDefinition, monNom, monObjet, parentQt, maCommande ) else: - from InterfaceQT4.monWidgetPlusieursInto import ( + from InterfaceGUI.QT5.monWidgetPlusieursInto import ( MonWidgetPlusieursInto, ) @@ -295,7 +295,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): ) ) if enable_salome_selection: - from InterfaceQT4.monWidgetPlusieursBase import ( + from InterfaceGUI.QT5.monWidgetPlusieursBase import ( MonWidgetPlusieursBase, ) @@ -303,7 +303,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): self, maDefinition, monNom, monObjet, parentQt, maCommande ) elif len(listeAAfficher) == 0: - from InterfaceQT4.monWidgetVide import MonWidgetVide + from InterfaceGUI.QT5.monWidgetVide import MonWidgetVide widget = MonWidgetVide( self, maDefinition, monNom, monObjet, parentQt, maCommande @@ -311,7 +311,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): elif self.item in self.editor.listeDesListesOuvertes or not ( self.editor.afficheListesPliees ): - from InterfaceQT4.monWidgetPlusieursASSDIntoOrdonne import ( + from InterfaceGUI.QT5.monWidgetPlusieursASSDIntoOrdonne import ( MonWidgetPlusieursASSDIntoOrdonne, ) @@ -319,7 +319,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): self, maDefinition, monNom, monObjet, parentQt, maCommande ) else: - from InterfaceQT4.monWidgetPlusieursPlie import ( + from InterfaceGUI.QT5.monWidgetPlusieursPlie import ( MonWidgetPlusieursPlieASSD, ) @@ -328,7 +328,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): ) elif self.item.waitTuple(): if self.item.object.definition.fenetreIhm == "Tableau": - from InterfaceQT4.monWidgetTableau import MonWidgetTableau + from InterfaceGUI.QT5.monWidgetTableau import MonWidgetTableau widget = MonWidgetTableau( self, maDefinition, monNom, monObjet, parentQt, maCommande @@ -336,7 +336,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): else: num = self.item.object.definition.type[0].ntuple nomDeLaClasse = "MonWidgetPlusieursTuple" + str(num) - nomDuFichier = "InterfaceQT4.monWidgetPlusieursTupleN" + nomDuFichier = "InterfaceGUI.QT5.monWidgetPlusieursTupleN" try: _temp = __import__( nomDuFichier, globals(), locals(), [nomDeLaClasse], 0 @@ -354,7 +354,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): if self.item in self.editor.listeDesListesOuvertes or not ( self.editor.afficheListesPliees ): - from InterfaceQT4.monWidgetPlusieursInto import ( + from InterfaceGUI.QT5.monWidgetPlusieursInto import ( MonWidgetPlusieursInto, ) @@ -362,7 +362,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): self, maDefinition, monNom, monObjet, parentQt, maCommande ) else: - from InterfaceQT4.monWidgetPlusieursPlie import ( + from InterfaceGUI.QT5.monWidgetPlusieursPlie import ( MonWidgetPlusieursPlie, ) @@ -373,7 +373,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): if self.item in self.editor.listeDesListesOuvertes or not ( self.editor.afficheListesPliees ): - from InterfaceQT4.monWidgetPlusieursIntoOrdonne import ( + from InterfaceGUI.QT5.monWidgetPlusieursIntoOrdonne import ( MonWidgetPlusieursIntoOrdonne, ) @@ -381,7 +381,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): self, maDefinition, monNom, monObjet, parentQt, maCommande ) else: - from InterfaceQT4.monWidgetPlusieursPlie import ( + from InterfaceGUI.QT5.monWidgetPlusieursPlie import ( MonWidgetPlusieursPlie, ) @@ -390,7 +390,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): ) else: if self.item.waitUserAssdOrAssdMultipleEnCreation(): - from InterfaceQT4.monWidgetPlusieursCreeUserAssd import ( + from InterfaceGUI.QT5.monWidgetPlusieursCreeUserAssd import ( MonWidgetPlusieursCreeUserAssd, ) @@ -400,7 +400,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): elif self.item in self.editor.listeDesListesOuvertes or not ( self.editor.afficheListesPliees ): - from InterfaceQT4.monWidgetPlusieursBase import ( + from InterfaceGUI.QT5.monWidgetPlusieursBase import ( MonWidgetPlusieursBase, ) @@ -408,7 +408,7 @@ class Node(browser.JDCNode, typeNode.PopUpMenuNodeMinimal): self, maDefinition, monNom, monObjet, parentQt, maCommande ) else: - from InterfaceQT4.monWidgetPlusieursPlie import ( + from InterfaceGUI.QT5.monWidgetPlusieursPlie import ( MonWidgetPlusieursPlie, ) diff --git a/InterfaceQT4/configuration.py b/InterfaceGUI/QT5/configuration.py similarity index 100% rename from InterfaceQT4/configuration.py rename to InterfaceGUI/QT5/configuration.py diff --git a/InterfaceQT4/editor.py b/InterfaceGUI/QT5/editor.py similarity index 99% rename from InterfaceQT4/editor.py rename to InterfaceGUI/QT5/editor.py index 6d204a24..f19e3635 100755 --- a/InterfaceQT4/editor.py +++ b/InterfaceGUI/QT5/editor.py @@ -34,17 +34,17 @@ from Extensions.i18n import tr from Editeur import session from Editeur import comploader from Editeur import Objecttreeitem -from InterfaceQT4 import browser +from InterfaceGUI.QT5 import browser from desBaseWidget import Ui_baseWidget -from InterfaceQT4.monViewTexte import ViewText +from InterfaceGUI.QT5.monViewTexte import ViewText from monWidgetCreeParam import MonWidgetCreeParam DictExtensions = {"MAP": ".map", "TELEMAC": ".cas"} debug = False -from InterfaceQT4.editorSsIhm import JDCEditorSsIhm +from InterfaceGUI.editorSsIhm import JDCEditorSsIhm class JDCEditor(JDCEditorSsIhm, Ui_baseWidget, QWidget): @@ -513,7 +513,7 @@ class JDCEditor(JDCEditorSsIhm, Ui_baseWidget, QWidget): listeIndex = [] listeChild = [] listeItem = [] - from InterfaceQT4 import compojdc + from InterfaceGUI.QT5 import compojdc noeudOuColler = self.node_selected[0] if not (isinstance(noeudOuColler.treeParent, compojdc.Node)): diff --git a/InterfaceQT4/feuille.py b/InterfaceGUI/QT5/feuille.py similarity index 100% rename from InterfaceQT4/feuille.py rename to InterfaceGUI/QT5/feuille.py diff --git a/InterfaceQT4/gereIcones.py b/InterfaceGUI/QT5/gereIcones.py similarity index 100% rename from InterfaceQT4/gereIcones.py rename to InterfaceGUI/QT5/gereIcones.py diff --git a/InterfaceQT4/gereListe.py b/InterfaceGUI/QT5/gereListe.py similarity index 99% rename from InterfaceQT4/gereListe.py rename to InterfaceGUI/QT5/gereListe.py index 4a3e06e7..466fe50c 100644 --- a/InterfaceQT4/gereListe.py +++ b/InterfaceGUI/QT5/gereListe.py @@ -27,7 +27,7 @@ from PyQt5.QtCore import QEvent, Qt, QTimer from PyQt5.QtGui import QIcon, QPalette from Extensions.i18n import tr -from InterfaceQT4.monViewTexte import ViewText +from InterfaceGUI.QT5.monViewTexte import ViewText # ---------------------- # diff --git a/InterfaceQT4/gereListeAvril11.py b/InterfaceGUI/QT5/gereListeAvril11.py similarity index 99% rename from InterfaceQT4/gereListeAvril11.py rename to InterfaceGUI/QT5/gereListeAvril11.py index 3510b96d..69e809b8 100644 --- a/InterfaceQT4/gereListeAvril11.py +++ b/InterfaceGUI/QT5/gereListeAvril11.py @@ -27,7 +27,7 @@ from PyQt5.QtCore import QEvent, Qt, QTimer from PyQt5.QtGui import QIcon, QPalette from Extensions.i18n import tr -from InterfaceQT4.monViewTexte import ViewText +from InterfaceGUI.QT5.monViewTexte import ViewText # ---------------------- # diff --git a/InterfaceQT4/gereRegles.py b/InterfaceGUI/QT5/gereRegles.py similarity index 100% rename from InterfaceQT4/gereRegles.py rename to InterfaceGUI/QT5/gereRegles.py diff --git a/InterfaceQT4/gereTraduction.py b/InterfaceGUI/QT5/gereTraduction.py similarity index 100% rename from InterfaceQT4/gereTraduction.py rename to InterfaceGUI/QT5/gereTraduction.py diff --git a/InterfaceQT4/groupe.py b/InterfaceGUI/QT5/groupe.py similarity index 100% rename from InterfaceQT4/groupe.py rename to InterfaceGUI/QT5/groupe.py diff --git a/InterfaceQT4/monBoutonValide.py b/InterfaceGUI/QT5/monBoutonValide.py similarity index 100% rename from InterfaceQT4/monBoutonValide.py rename to InterfaceGUI/QT5/monBoutonValide.py diff --git a/InterfaceQT4/monChoixCata.py b/InterfaceGUI/QT5/monChoixCata.py similarity index 100% rename from InterfaceQT4/monChoixCata.py rename to InterfaceGUI/QT5/monChoixCata.py diff --git a/InterfaceQT4/monChoixCode.py b/InterfaceGUI/QT5/monChoixCode.py similarity index 100% rename from InterfaceQT4/monChoixCode.py rename to InterfaceGUI/QT5/monChoixCode.py diff --git a/InterfaceQT4/monChoixCommande.py b/InterfaceGUI/QT5/monChoixCommande.py similarity index 100% rename from InterfaceQT4/monChoixCommande.py rename to InterfaceGUI/QT5/monChoixCommande.py diff --git a/InterfaceQT4/monChoixLangue.py b/InterfaceGUI/QT5/monChoixLangue.py similarity index 100% rename from InterfaceQT4/monChoixLangue.py rename to InterfaceGUI/QT5/monChoixLangue.py diff --git a/InterfaceQT4/monFonctionPanel.py b/InterfaceGUI/QT5/monFonctionPanel.py similarity index 100% rename from InterfaceQT4/monFonctionPanel.py rename to InterfaceGUI/QT5/monFonctionPanel.py diff --git a/InterfaceQT4/monGroupeOptionnel.py b/InterfaceGUI/QT5/monGroupeOptionnel.py similarity index 100% rename from InterfaceQT4/monGroupeOptionnel.py rename to InterfaceGUI/QT5/monGroupeOptionnel.py diff --git a/InterfaceQT4/monLabelClic.py b/InterfaceGUI/QT5/monLabelClic.py similarity index 100% rename from InterfaceQT4/monLabelClic.py rename to InterfaceGUI/QT5/monLabelClic.py diff --git a/InterfaceQT4/monLayoutBouton.py b/InterfaceGUI/QT5/monLayoutBouton.py similarity index 100% rename from InterfaceQT4/monLayoutBouton.py rename to InterfaceGUI/QT5/monLayoutBouton.py diff --git a/InterfaceQT4/monRecherche.py b/InterfaceGUI/QT5/monRecherche.py similarity index 100% rename from InterfaceQT4/monRecherche.py rename to InterfaceGUI/QT5/monRecherche.py diff --git a/InterfaceQT4/monRechercheCatalogue.py b/InterfaceGUI/QT5/monRechercheCatalogue.py similarity index 100% rename from InterfaceQT4/monRechercheCatalogue.py rename to InterfaceGUI/QT5/monRechercheCatalogue.py diff --git a/InterfaceQT4/monSelectVal.py b/InterfaceGUI/QT5/monSelectVal.py similarity index 100% rename from InterfaceQT4/monSelectVal.py rename to InterfaceGUI/QT5/monSelectVal.py diff --git a/InterfaceQT4/monViewRegles.py b/InterfaceGUI/QT5/monViewRegles.py similarity index 100% rename from InterfaceQT4/monViewRegles.py rename to InterfaceGUI/QT5/monViewRegles.py diff --git a/InterfaceQT4/monViewTexte.py b/InterfaceGUI/QT5/monViewTexte.py similarity index 100% rename from InterfaceQT4/monViewTexte.py rename to InterfaceGUI/QT5/monViewTexte.py diff --git a/InterfaceQT4/monVisu.py b/InterfaceGUI/QT5/monVisu.py similarity index 100% rename from InterfaceQT4/monVisu.py rename to InterfaceGUI/QT5/monVisu.py diff --git a/InterfaceQT4/monWidget4a6RadioButton.py b/InterfaceGUI/QT5/monWidget4a6RadioButton.py similarity index 100% rename from InterfaceQT4/monWidget4a6RadioButton.py rename to InterfaceGUI/QT5/monWidget4a6RadioButton.py diff --git a/InterfaceQT4/monWidget4a6RadioButtonSD.py b/InterfaceGUI/QT5/monWidget4a6RadioButtonSD.py similarity index 100% rename from InterfaceQT4/monWidget4a6RadioButtonSD.py rename to InterfaceGUI/QT5/monWidget4a6RadioButtonSD.py diff --git a/InterfaceQT4/monWidgetBloc.py b/InterfaceGUI/QT5/monWidgetBloc.py similarity index 100% rename from InterfaceQT4/monWidgetBloc.py rename to InterfaceGUI/QT5/monWidgetBloc.py diff --git a/InterfaceQT4/monWidgetCB.py b/InterfaceGUI/QT5/monWidgetCB.py similarity index 96% rename from InterfaceQT4/monWidgetCB.py rename to InterfaceGUI/QT5/monWidgetCB.py index 8a4e2629..7c685fa4 100644 --- a/InterfaceQT4/monWidgetCB.py +++ b/InterfaceGUI/QT5/monWidgetCB.py @@ -24,10 +24,10 @@ import types, os # Modules Eficas from Extensions.i18n import tr -from InterfaceQT4.feuille import Feuille +from InterfaceGUI.QT5.feuille import Feuille from desWidgetCB import Ui_WidgetCB -from InterfaceQT4.politiquesValidation import PolitiqueUnique -from InterfaceQT4.qtSaisie import SaisieValeur +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.qtSaisie import SaisieValeur from PyQt5.QtWidgets import QComboBox, QCompleter from PyQt5.QtCore import Qt, QEvent diff --git a/InterfaceQT4/monWidgetCBIntoSug.py b/InterfaceGUI/QT5/monWidgetCBIntoSug.py similarity index 100% rename from InterfaceQT4/monWidgetCBIntoSug.py rename to InterfaceGUI/QT5/monWidgetCBIntoSug.py diff --git a/InterfaceQT4/monWidgetCBSD.py b/InterfaceGUI/QT5/monWidgetCBSD.py similarity index 100% rename from InterfaceQT4/monWidgetCBSD.py rename to InterfaceGUI/QT5/monWidgetCBSD.py diff --git a/InterfaceQT4/monWidgetCommande.py b/InterfaceGUI/QT5/monWidgetCommande.py similarity index 100% rename from InterfaceQT4/monWidgetCommande.py rename to InterfaceGUI/QT5/monWidgetCommande.py diff --git a/InterfaceQT4/monWidgetCommandeDeplie1Niveau.py b/InterfaceGUI/QT5/monWidgetCommandeDeplie1Niveau.py similarity index 98% rename from InterfaceQT4/monWidgetCommandeDeplie1Niveau.py rename to InterfaceGUI/QT5/monWidgetCommandeDeplie1Niveau.py index 2b1158cf..8b24f59d 100644 --- a/InterfaceQT4/monWidgetCommandeDeplie1Niveau.py +++ b/InterfaceGUI/QT5/monWidgetCommandeDeplie1Niveau.py @@ -23,7 +23,7 @@ import types, os import traceback from PyQt5.QtGui import QIcon -from InterfaceQT4.monWidgetCommande import MonWidgetCommande +from InterfaceGUI.QT5.monWidgetCommande import MonWidgetCommande from PyQt5.QtWidgets import QSpacerItem, QSizePolicy diff --git a/InterfaceQT4/monWidgetCommentaire.py b/InterfaceGUI/QT5/monWidgetCommentaire.py similarity index 100% rename from InterfaceQT4/monWidgetCommentaire.py rename to InterfaceGUI/QT5/monWidgetCommentaire.py diff --git a/InterfaceQT4/monWidgetCreeParam.py b/InterfaceGUI/QT5/monWidgetCreeParam.py similarity index 100% rename from InterfaceQT4/monWidgetCreeParam.py rename to InterfaceGUI/QT5/monWidgetCreeParam.py diff --git a/InterfaceQT4/monWidgetCreeUserAssd.py b/InterfaceGUI/QT5/monWidgetCreeUserAssd.py similarity index 100% rename from InterfaceQT4/monWidgetCreeUserAssd.py rename to InterfaceGUI/QT5/monWidgetCreeUserAssd.py diff --git a/InterfaceQT4/monWidgetDate.py b/InterfaceGUI/QT5/monWidgetDate.py similarity index 100% rename from InterfaceQT4/monWidgetDate.py rename to InterfaceGUI/QT5/monWidgetDate.py diff --git a/InterfaceQT4/monWidgetFact.py b/InterfaceGUI/QT5/monWidgetFact.py similarity index 100% rename from InterfaceQT4/monWidgetFact.py rename to InterfaceGUI/QT5/monWidgetFact.py diff --git a/InterfaceQT4/monWidgetFactPlie.py b/InterfaceGUI/QT5/monWidgetFactPlie.py similarity index 100% rename from InterfaceQT4/monWidgetFactPlie.py rename to InterfaceGUI/QT5/monWidgetFactPlie.py diff --git a/InterfaceQT4/monWidgetFormule.py b/InterfaceGUI/QT5/monWidgetFormule.py similarity index 100% rename from InterfaceQT4/monWidgetFormule.py rename to InterfaceGUI/QT5/monWidgetFormule.py diff --git a/InterfaceQT4/monWidgetHeure.py b/InterfaceGUI/QT5/monWidgetHeure.py similarity index 100% rename from InterfaceQT4/monWidgetHeure.py rename to InterfaceGUI/QT5/monWidgetHeure.py diff --git a/InterfaceQT4/monWidgetInactif.py b/InterfaceGUI/QT5/monWidgetInactif.py similarity index 100% rename from InterfaceQT4/monWidgetInactif.py rename to InterfaceGUI/QT5/monWidgetInactif.py diff --git a/InterfaceQT4/monWidgetInfo.py b/InterfaceGUI/QT5/monWidgetInfo.py similarity index 100% rename from InterfaceQT4/monWidgetInfo.py rename to InterfaceGUI/QT5/monWidgetInfo.py diff --git a/InterfaceQT4/monWidgetIntoSug.py b/InterfaceGUI/QT5/monWidgetIntoSug.py similarity index 100% rename from InterfaceQT4/monWidgetIntoSug.py rename to InterfaceGUI/QT5/monWidgetIntoSug.py diff --git a/InterfaceQT4/monWidgetMatrice.py b/InterfaceGUI/QT5/monWidgetMatrice.py similarity index 100% rename from InterfaceQT4/monWidgetMatrice.py rename to InterfaceGUI/QT5/monWidgetMatrice.py diff --git a/InterfaceQT4/monWidgetNiveauFact.py b/InterfaceGUI/QT5/monWidgetNiveauFact.py similarity index 97% rename from InterfaceQT4/monWidgetNiveauFact.py rename to InterfaceGUI/QT5/monWidgetNiveauFact.py index fd5c0762..ada2e67a 100644 --- a/InterfaceQT4/monWidgetNiveauFact.py +++ b/InterfaceGUI/QT5/monWidgetNiveauFact.py @@ -22,8 +22,8 @@ from PyQt5.QtWidgets import QWidget from PyQt5.QtGui import QIcon from desWidgetNiveauFact import Ui_WidgetNiveauFact -from InterfaceQT4.monWidgetOptionnel import MonWidgetOptionnel -from InterfaceQT4.groupe import Groupe +from InterfaceGUI.QT5.monWidgetOptionnel import MonWidgetOptionnel +from InterfaceGUI.QT5.groupe import Groupe from Extensions.i18n import tr @@ -34,7 +34,7 @@ class MonWidgetNiveauFact(Ui_WidgetNiveauFact, Groupe): self.listeAffichageWidget = [] self.listeBoutonAChanger = [] Groupe.__init__(self, node, editor, None, definition, obj, 1, self) - from InterfaceQT4 import composimp + from InterfaceGUI.QT5 import composimp if isinstance(self.node, composimp.Node): widget = self.node.getPanelGroupe(self, self.maCommande) diff --git a/InterfaceQT4/monWidgetOptionnel.py b/InterfaceGUI/QT5/monWidgetOptionnel.py similarity index 100% rename from InterfaceQT4/monWidgetOptionnel.py rename to InterfaceGUI/QT5/monWidgetOptionnel.py diff --git a/InterfaceQT4/monWidgetParam.py b/InterfaceGUI/QT5/monWidgetParam.py similarity index 98% rename from InterfaceQT4/monWidgetParam.py rename to InterfaceGUI/QT5/monWidgetParam.py index 9a1d573c..8655294e 100644 --- a/InterfaceQT4/monWidgetParam.py +++ b/InterfaceGUI/QT5/monWidgetParam.py @@ -21,7 +21,7 @@ import os, re import types from desWidgetParam import Ui_WidgetParam -from InterfaceQT4.gereIcones import FacultatifOuOptionnel +from InterfaceGUI.QT5.gereIcones import FacultatifOuOptionnel from PyQt5.QtWidgets import QWidget, QMessageBox from PyQt5.QtGui import QIcon diff --git a/InterfaceQT4/monWidgetPlusieursASSDIntoOrdonne.py b/InterfaceGUI/QT5/monWidgetPlusieursASSDIntoOrdonne.py similarity index 100% rename from InterfaceQT4/monWidgetPlusieursASSDIntoOrdonne.py rename to InterfaceGUI/QT5/monWidgetPlusieursASSDIntoOrdonne.py diff --git a/InterfaceQT4/monWidgetPlusieursBase.py b/InterfaceGUI/QT5/monWidgetPlusieursBase.py similarity index 97% rename from InterfaceQT4/monWidgetPlusieursBase.py rename to InterfaceGUI/QT5/monWidgetPlusieursBase.py index b1d14a22..f5162bc5 100644 --- a/InterfaceQT4/monWidgetPlusieursBase.py +++ b/InterfaceGUI/QT5/monWidgetPlusieursBase.py @@ -27,13 +27,13 @@ from PyQt5.QtCore import QTimer, QSize, Qt # Modules Eficas from Extensions.i18n import tr -from InterfaceQT4.feuille import Feuille +from InterfaceGUI.QT5.feuille import Feuille from desWidgetPlusieursBase import Ui_WidgetPlusieursBase -from InterfaceQT4.politiquesValidation import PolitiquePlusieurs -from InterfaceQT4.qtSaisie import SaisieValeur -from InterfaceQT4.gereListe import GereListe -from InterfaceQT4.gereListe import GerePlie -from InterfaceQT4.gereListe import LECustom +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 dicoLongueur = {2: 95, 3: 125, 4: 154, 5: 183, 6: 210, float("inf"): 210} hauteurMax = 253 diff --git a/InterfaceQT4/monWidgetPlusieursCreeUserAssd.py b/InterfaceGUI/QT5/monWidgetPlusieursCreeUserAssd.py similarity index 100% rename from InterfaceQT4/monWidgetPlusieursCreeUserAssd.py rename to InterfaceGUI/QT5/monWidgetPlusieursCreeUserAssd.py diff --git a/InterfaceQT4/monWidgetPlusieursInto.py b/InterfaceGUI/QT5/monWidgetPlusieursInto.py similarity index 97% rename from InterfaceQT4/monWidgetPlusieursInto.py rename to InterfaceGUI/QT5/monWidgetPlusieursInto.py index fb9ed71f..c4230965 100644 --- a/InterfaceQT4/monWidgetPlusieursInto.py +++ b/InterfaceGUI/QT5/monWidgetPlusieursInto.py @@ -26,12 +26,12 @@ from PyQt5.QtCore import Qt from Extensions.i18n import tr -from InterfaceQT4.feuille import Feuille +from InterfaceGUI.QT5.feuille import Feuille from desWidgetPlusieursInto import Ui_WidgetPlusieursInto -from InterfaceQT4.politiquesValidation import PolitiquePlusieurs -from InterfaceQT4.qtSaisie import SaisieValeur -from InterfaceQT4.gereListe import GerePlie -from InterfaceQT4.gereListe import GereListe +from InterfaceGUI.QT5.politiquesValidation import PolitiquePlusieurs +from InterfaceGUI.QT5.qtSaisie import SaisieValeur +from InterfaceGUI.QT5.gereListe import GerePlie +from InterfaceGUI.QT5.gereListe import GereListe class MonWidgetPlusieursInto(Ui_WidgetPlusieursInto, Feuille, GerePlie, GereListe): diff --git a/InterfaceQT4/monWidgetPlusieursIntoOrdonne.py b/InterfaceGUI/QT5/monWidgetPlusieursIntoOrdonne.py similarity index 100% rename from InterfaceQT4/monWidgetPlusieursIntoOrdonne.py rename to InterfaceGUI/QT5/monWidgetPlusieursIntoOrdonne.py diff --git a/InterfaceQT4/monWidgetPlusieursPlie.py b/InterfaceGUI/QT5/monWidgetPlusieursPlie.py similarity index 100% rename from InterfaceQT4/monWidgetPlusieursPlie.py rename to InterfaceGUI/QT5/monWidgetPlusieursPlie.py diff --git a/InterfaceQT4/monWidgetPlusieursTuple.py b/InterfaceGUI/QT5/monWidgetPlusieursTuple.py similarity index 98% rename from InterfaceQT4/monWidgetPlusieursTuple.py rename to InterfaceGUI/QT5/monWidgetPlusieursTuple.py index 7297f9c8..0206b597 100644 --- a/InterfaceQT4/monWidgetPlusieursTuple.py +++ b/InterfaceGUI/QT5/monWidgetPlusieursTuple.py @@ -25,11 +25,11 @@ from PyQt5.QtCore import QSize, Qt, QTimer from Extensions.i18n import tr -from InterfaceQT4.feuille import Feuille -from InterfaceQT4.politiquesValidation import PolitiquePlusieurs -from InterfaceQT4.qtSaisie import SaisieValeur -from InterfaceQT4.gereListe import GereListe -from InterfaceQT4.gereListe import LECustom +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 diff --git a/InterfaceQT4/monWidgetPlusieursTupleN.py b/InterfaceGUI/QT5/monWidgetPlusieursTupleN.py similarity index 100% rename from InterfaceQT4/monWidgetPlusieursTupleN.py rename to InterfaceGUI/QT5/monWidgetPlusieursTupleN.py diff --git a/InterfaceQT4/monWidgetRadioButton.py b/InterfaceGUI/QT5/monWidgetRadioButton.py similarity index 100% rename from InterfaceQT4/monWidgetRadioButton.py rename to InterfaceGUI/QT5/monWidgetRadioButton.py diff --git a/InterfaceQT4/monWidgetSDCOInto.py b/InterfaceGUI/QT5/monWidgetSDCOInto.py similarity index 100% rename from InterfaceQT4/monWidgetSDCOInto.py rename to InterfaceGUI/QT5/monWidgetSDCOInto.py diff --git a/InterfaceQT4/monWidgetSimpBase.py b/InterfaceGUI/QT5/monWidgetSimpBase.py similarity index 100% rename from InterfaceQT4/monWidgetSimpBase.py rename to InterfaceGUI/QT5/monWidgetSimpBase.py diff --git a/InterfaceQT4/monWidgetSimpBool.py b/InterfaceGUI/QT5/monWidgetSimpBool.py similarity index 100% rename from InterfaceQT4/monWidgetSimpBool.py rename to InterfaceGUI/QT5/monWidgetSimpBool.py diff --git a/InterfaceQT4/monWidgetSimpComplexe.py b/InterfaceGUI/QT5/monWidgetSimpComplexe.py similarity index 100% rename from InterfaceQT4/monWidgetSimpComplexe.py rename to InterfaceGUI/QT5/monWidgetSimpComplexe.py diff --git a/InterfaceQT4/monWidgetSimpFichier.py b/InterfaceGUI/QT5/monWidgetSimpFichier.py similarity index 100% rename from InterfaceQT4/monWidgetSimpFichier.py rename to InterfaceGUI/QT5/monWidgetSimpFichier.py diff --git a/InterfaceQT4/monWidgetSimpSalome.py b/InterfaceGUI/QT5/monWidgetSimpSalome.py similarity index 100% rename from InterfaceQT4/monWidgetSimpSalome.py rename to InterfaceGUI/QT5/monWidgetSimpSalome.py diff --git a/InterfaceQT4/monWidgetSimpTuple.py b/InterfaceGUI/QT5/monWidgetSimpTuple.py similarity index 95% rename from InterfaceQT4/monWidgetSimpTuple.py rename to InterfaceGUI/QT5/monWidgetSimpTuple.py index a54e9c17..a8d0888d 100644 --- a/InterfaceQT4/monWidgetSimpTuple.py +++ b/InterfaceGUI/QT5/monWidgetSimpTuple.py @@ -23,9 +23,9 @@ from PyQt5.QtCore import Qt # Modules Eficas from Extensions.i18n import tr -from InterfaceQT4.feuille import Feuille -from InterfaceQT4.politiquesValidation import PolitiqueUnique -from InterfaceQT4.qtSaisie import SaisieValeur +from InterfaceGUI.QT5.feuille import Feuille +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.qtSaisie import SaisieValeur class MonWidgetSimpTuple(Feuille): diff --git a/InterfaceQT4/monWidgetSimpTupleN.py b/InterfaceGUI/QT5/monWidgetSimpTupleN.py similarity index 97% rename from InterfaceQT4/monWidgetSimpTupleN.py rename to InterfaceGUI/QT5/monWidgetSimpTupleN.py index 7b5e144e..599b0caa 100644 --- a/InterfaceQT4/monWidgetSimpTupleN.py +++ b/InterfaceGUI/QT5/monWidgetSimpTupleN.py @@ -23,8 +23,8 @@ # from PyQt4.QtCore import * from Extensions.i18n import tr -from InterfaceQT4.feuille import Feuille -from InterfaceQT4.monWidgetSimpTuple import MonWidgetSimpTuple +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 diff --git a/InterfaceQT4/monWidgetSimpTxt.py b/InterfaceGUI/QT5/monWidgetSimpTxt.py similarity index 100% rename from InterfaceQT4/monWidgetSimpTxt.py rename to InterfaceGUI/QT5/monWidgetSimpTxt.py diff --git a/InterfaceQT4/monWidgetTableau.py b/InterfaceGUI/QT5/monWidgetTableau.py similarity index 94% rename from InterfaceQT4/monWidgetTableau.py rename to InterfaceGUI/QT5/monWidgetTableau.py index 27bd2121..065c4d2f 100644 --- a/InterfaceQT4/monWidgetTableau.py +++ b/InterfaceGUI/QT5/monWidgetTableau.py @@ -22,8 +22,8 @@ from PyQt5.QtWidgets import QLabel, QSizePolicy, QSpacerItem from PyQt5.QtCore import QSize -from InterfaceQT4.feuille import Feuille -from InterfaceQT4.monWidgetPlusieursTuple import MonWidgetPlusieursTuple +from InterfaceGUI.QT5.feuille import Feuille +from InterfaceGUI.QT5.monWidgetPlusieursTuple import MonWidgetPlusieursTuple from desWidgetPlusieursTuple import Ui_WidgetPlusieursTuple from desWidgetTableau import Ui_WidgetTableau diff --git a/InterfaceQT4/monWidgetUniqueSDCO.py b/InterfaceGUI/QT5/monWidgetUniqueSDCO.py similarity index 100% rename from InterfaceQT4/monWidgetUniqueSDCO.py rename to InterfaceGUI/QT5/monWidgetUniqueSDCO.py diff --git a/InterfaceQT4/monWidgetVide.py b/InterfaceGUI/QT5/monWidgetVide.py similarity index 95% rename from InterfaceQT4/monWidgetVide.py rename to InterfaceGUI/QT5/monWidgetVide.py index fd2e0ba2..501d6cf8 100644 --- a/InterfaceQT4/monWidgetVide.py +++ b/InterfaceGUI/QT5/monWidgetVide.py @@ -23,7 +23,7 @@ from Extensions.i18n import tr from .feuille import Feuille from desWidgetVide import Ui_WidgetVide -from InterfaceQT4.politiquesValidation import PolitiqueUnique +from InterfaceGUI.QT5.politiquesValidation import PolitiqueUnique class MonWidgetVide(Ui_WidgetVide, Feuille): diff --git a/InterfaceQT4/politiquesValidation.py b/InterfaceGUI/QT5/politiquesValidation.py similarity index 100% rename from InterfaceQT4/politiquesValidation.py rename to InterfaceGUI/QT5/politiquesValidation.py diff --git a/InterfaceQT4/qtEficas.py b/InterfaceGUI/QT5/qtEficas.py similarity index 98% rename from InterfaceQT4/qtEficas.py rename to InterfaceGUI/QT5/qtEficas.py index 7ac74d75..e0625329 100755 --- a/InterfaceQT4/qtEficas.py +++ b/InterfaceGUI/QT5/qtEficas.py @@ -19,24 +19,18 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # import os, sys +#pathUi = os.path.abspath(os.path.dirname(__file__), '..', '..', 'UiQT5') +#if not pathUi not in sys.path : sys.path.append(pathUi) -from PyQt5.QtWidgets import ( - QApplication, - QMainWindow, - QGridLayout, - QBoxLayout, - QMenu, - QAction, - QMessageBox, -) +from PyQt5.QtWidgets import ( QApplication, QMainWindow, QGridLayout, QBoxLayout, QMenu, QAction, QMessageBox,) from PyQt5.QtGui import QIcon from PyQt5.QtCore import Qt, QSize from Editeur import session -from myMain import Ui_Eficas -from InterfaceQT4.viewManager import MyViewManager -from InterfaceQT4.qtEficasSsIhm import AppliSsIhm +from UiQT5.myMain import Ui_Eficas +from InterfaceGUI.QT5.viewManager import MyViewManager +from InterfaceGUI.qtEficasSsIhm import AppliSsIhm from Extensions.i18n import tr from Extensions.eficas_exception import EficasException @@ -57,7 +51,7 @@ class Appli(AppliSsIhm, Ui_Eficas, QMainWindow): langue="en", ssIhm=False, labelCode=None, - GUIPath="InterfaceQT4", + GUIPath="InterfaceGUI.QT5", ): """ Constructor @@ -96,7 +90,7 @@ class Appli(AppliSsIhm, Ui_Eficas, QMainWindow): self.suiteTelemac = False if hasattr(self, "maConfiguration"): if self.maConfiguration.demandeLangue: - from InterfaceQT4.monChoixLangue import MonChoixLangue + from InterfaceGUI.QT5.monChoixLangue import MonChoixLangue widgetLangue = MonChoixLangue(self) ret = widgetLangue.exec_() @@ -212,7 +206,7 @@ class Appli(AppliSsIhm, Ui_Eficas, QMainWindow): self.ssCode = ssCode if self.code == None: self.cleanPath() - from InterfaceQT4.monChoixCode import MonChoixCode + from InterfaceGUI.QT5.monChoixCode import MonChoixCode widgetChoix = MonChoixCode(self) ret = widgetChoix.exec_() diff --git a/InterfaceQT4/qtSaisie.py b/InterfaceGUI/QT5/qtSaisie.py similarity index 100% rename from InterfaceQT4/qtSaisie.py rename to InterfaceGUI/QT5/qtSaisie.py diff --git a/InterfaceQT4/ssIhm.py b/InterfaceGUI/QT5/ssIhm.py similarity index 100% rename from InterfaceQT4/ssIhm.py rename to InterfaceGUI/QT5/ssIhm.py diff --git a/InterfaceQT4/typeNode.py b/InterfaceGUI/QT5/typeNode.py similarity index 100% rename from InterfaceQT4/typeNode.py rename to InterfaceGUI/QT5/typeNode.py diff --git a/InterfaceQT4/viewManager.py b/InterfaceGUI/QT5/viewManager.py similarity index 99% rename from InterfaceQT4/viewManager.py rename to InterfaceGUI/QT5/viewManager.py index 58b4a345..c4ea4e56 100644 --- a/InterfaceQT4/viewManager.py +++ b/InterfaceGUI/QT5/viewManager.py @@ -399,7 +399,7 @@ class MyViewManager(object): include=include, ) else: - from InterfaceQT4.editor import JDCEditor + from InterfaceGUI.QT5.editor import JDCEditor editor = JDCEditor( self.appliEficas, fichier, diff --git a/InterfaceGUI/__init__.py b/InterfaceGUI/__init__.py new file mode 100644 index 00000000..24d44c17 --- /dev/null +++ b/InterfaceGUI/__init__.py @@ -0,0 +1,23 @@ +# -*- coding: utf-8 -*- +# Copyright (C) 2007-2024 EDF R&D +# +# This library is free software; you can redistribute it and/or +# modify it under the terms of the GNU Lesser General Public +# License as published by the Free Software Foundation; either +# version 2.1 of the License. +# +# This library is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU +# Lesser General Public License for more details. +# +# You should have received a copy of the GNU Lesser General Public +# License along with this library; if not, write to the Free Software +# Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA +# +# See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com +# +""" + Ce package contient les fonctionnalites necessaires + pour l'editeur graphique QT +""" diff --git a/InterfaceGUI/a b/InterfaceGUI/a new file mode 100644 index 00000000..66c7dd4b --- /dev/null +++ b/InterfaceGUI/a @@ -0,0 +1,4 @@ +editorSsIhm.py: from acquiertGroupes import getGroupes +qtEficasSsIhm.py:from getVersion import getEficasVersion +qtEficasSsIhm.py: from Accas import eficasSalome +readercataXML.py:from readercata import ReaderCataCommun diff --git a/InterfaceQT4/editorSsIhm.py b/InterfaceGUI/editorSsIhm.py similarity index 99% rename from InterfaceQT4/editorSsIhm.py rename to InterfaceGUI/editorSsIhm.py index 331a17d1..2f175035 100755 --- a/InterfaceQT4/editorSsIhm.py +++ b/InterfaceGUI/editorSsIhm.py @@ -79,9 +79,9 @@ class JDCEditorSsIhm: or self.appliEficas.multi == True ): if self.maConfiguration.typeDeCata == "XML": - from InterfaceQT4 import readercataXML as readercata + from InterfaceGUI import readercataXML as readercata else: - from InterfaceQT4 import readercata + from InterfaceGUI import readercata self.readercata = readercata.ReaderCata(self, self.appliEficas) self.appliEficas.readercata = self.readercata self.appliEficas.code = self.code @@ -1344,7 +1344,7 @@ class JDCEditorSsIhm: ) QSfichier = QSfichier[0] self.fichierMED = QSfichier - from acquiertGroupes import getGroupes + from Extension.acquiertGroupes import getGroupes erreur, self.listeGroupes, self.nomMaillage, self.dicoCoord = getGroupes( self.fichierMED diff --git a/InterfaceQT4/getVersion.py b/InterfaceGUI/getVersion.py similarity index 100% rename from InterfaceQT4/getVersion.py rename to InterfaceGUI/getVersion.py diff --git a/InterfaceQT4/qtEficasSsIhm.py b/InterfaceGUI/qtEficasSsIhm.py similarity index 97% rename from InterfaceQT4/qtEficasSsIhm.py rename to InterfaceGUI/qtEficasSsIhm.py index 1dcd4c25..5eeb33a3 100755 --- a/InterfaceQT4/qtEficasSsIhm.py +++ b/InterfaceGUI/qtEficasSsIhm.py @@ -21,8 +21,8 @@ import os, sys from Extensions.eficas_exception import EficasException from Extensions import param2 -from InterfaceQT4.getVersion import getEficasVersion -from InterfaceQT4.viewManagerSsIhm import MyViewManagerSsIhm +from InterfaceGUI.getVersion import getEficasVersion +from viewManagerSsIhm import MyViewManagerSsIhm from Editeur import session @@ -111,11 +111,8 @@ class AppliSsIhm: self.withXSD = session.d_env.withXSD if self.salome: - import Accas - try: - import eficasSalome - + from Accas import eficasSalome Accas.SalomeEntry = eficasSalome.SalomeEntry except: print("eficas hors salome") diff --git a/InterfaceQT4/readercata.py b/InterfaceGUI/readercata.py similarity index 99% rename from InterfaceQT4/readercata.py rename to InterfaceGUI/readercata.py index b00414d5..61b59504 100644 --- a/InterfaceQT4/readercata.py +++ b/InterfaceGUI/readercata.py @@ -59,7 +59,7 @@ class ReaderCataCommun(object): else: title = tr("Choix d une version ") - from InterfaceQT4.monChoixCata import MonChoixCata + from InterfaceGUI.QT5.monChoixCata import MonChoixCata widgetChoix = MonChoixCata( self.appliEficas, [cata.labelCode for cata in cataListeChoix], title diff --git a/InterfaceQT4/readercataXML.py b/InterfaceGUI/readercataXML.py similarity index 95% rename from InterfaceQT4/readercataXML.py rename to InterfaceGUI/readercataXML.py index e5efc292..f3d10162 100644 --- a/InterfaceQT4/readercataXML.py +++ b/InterfaceGUI/readercataXML.py @@ -18,9 +18,10 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # """ - Ce module sert a lire un catalogue et a construire + Ce module SERVAIT a lire un catalogue et a construire un objet CataItem pour Eficas. Il s'appuie sur la classe READERCATA + OBSOLETE """ import autre_analyse_cata import uiinfo @@ -31,10 +32,9 @@ import uiinfo from monChoixCata import MonChoixCata from Extensions.i18n import tr from Extensions.eficas_exception import EficasException -from Efi2Xsd import readerEfiXsd +#from Efi2Xsd import readerEfiXsd from autre_analyse_cata import analyseCatalogue -# ATtention pas teste depuis le chgt de nom from readercata import ReaderCataCommun diff --git a/InterfaceQT4/viewManagerSsIhm.py b/InterfaceGUI/viewManagerSsIhm.py similarity index 97% rename from InterfaceQT4/viewManagerSsIhm.py rename to InterfaceGUI/viewManagerSsIhm.py index adbabe8a..3012d11f 100644 --- a/InterfaceQT4/viewManagerSsIhm.py +++ b/InterfaceGUI/viewManagerSsIhm.py @@ -18,14 +18,6 @@ # See http://www.salome-platform.org/ or email : webmaster.salome@opencascade.com # - - -try: - from builtins import str - from builtins import object -except: - pass - import os from Extensions.i18n import tr @@ -127,7 +119,7 @@ class MyViewManagerSsIhm(object): # avec handler pour les utilisateurs avance # sans pour les utilisateurs encore plus ancvances et les tests - from InterfaceQT4.editorSsIhm import JDCEditorSsIhm + from editorSsIhm import JDCEditorSsIhm editor = JDCEditorSsIhm( self.appliEficas, fichier, jdc, units=units, include=include @@ -145,7 +137,7 @@ class MyViewManagerSsIhm(object): def getNewEditorNormal(self, fichier=None, jdc=None, units=None, include=0): # -------------------------------------------------------------------------------- - from InterfaceQT4.editorSsIhm import JDCEditorSsIhm + from editorSsIhm import JDCEditorSsIhm editor = JDCEditorSsIhm( self.appliEficas, fichier, jdc, units=units, include=include -- 2.39.2