X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=InterfaceQT4%2Feficas_go.py;h=3416834e362b5c5062bf18176db041feb55a1ba5;hb=42895950e564e837c445896b5bac263370bdf37b;hp=40f404d943db2f98d9f5d82cca330961b1281c7f;hpb=16d5922e798b1254eb558678612711d72ed38b32;p=tools%2Feficas.git diff --git a/InterfaceQT4/eficas_go.py b/InterfaceQT4/eficas_go.py index 40f404d9..3416834e 100644 --- a/InterfaceQT4/eficas_go.py +++ b/InterfaceQT4/eficas_go.py @@ -22,14 +22,19 @@ # Modules Python import sys,os repIni=os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)),"..")) -ihmQTDir=os.path.join(repIni,"UiQT4") +from determine import monEnvQT5 +if monEnvQT5 : + ihmQTDir=os.path.join(repIni,"UiQT5") + from PyQt5.QtWidgets import QApplication +else : + ihmQTDir=os.path.join(repIni,"UiQT4") + from PyQt4.QtGui import QApplication 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) -from PyQt4.QtGui import * def lance_eficas(code=None,fichier=None,ssCode=None,multi=False,langue='en'): """ @@ -89,7 +94,8 @@ def lance_eficas_ssIhm_cherche_cr(code=None,fichier=None,ssCode=None,version=Non def lance_eficas_ssIhm_reecrit(code=None,fichier=None,ssCode=None,version=None): monEditeur=lance_eficas_ssIhm(code,fichier,ssCode,version) - fileName=fichier.split(".")[0]+"_73.comm" + print fichier + fileName=fichier.split(".")[0]+"_reecrit.comm" monEditeur.saveFileAs(fileName=fileName) def lance_eficas_param(code='Adao',fichier=None,version='V0',macro='ASSIMILATION_STUDY'):