X-Git-Url: http://git.salome-platform.org/gitweb/?a=blobdiff_plain;f=src%2FTools%2FMGCleanerPlug%2FMGCleanerMonViewText.py;h=e4030cc4443127f611517c2ca610582eb373e8f6;hb=c445ce74d816a2f89830ef0527a7ef9e76144c5e;hp=df10768327db93fd1d44bbd9b1984e2e80b6b791;hpb=5482b99d07dd144fd5be299e722f39a81de3b5be;p=modules%2Fsmesh.git diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py index df1076832..e4030cc44 100644 --- a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py +++ b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py @@ -1,5 +1,5 @@ # -*- coding: utf-8 -*- -# Copyright (C) 2013-2015 EDF R&D +# Copyright (C) 2013-2016 EDF R&D # # This library is free software; you can redistribute it and/or # modify it under the terms of the GNU Lesser General Public @@ -19,7 +19,8 @@ # # Modules Python -import string,types,os +import string,types,os,sys +import tempfile import traceback from PyQt4 import * @@ -51,16 +52,39 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog): # Je n arrive pas a utiliser le setEnvironment du QProcess # fonctionne hors Salome mais pas dans Salome ??? cmds='' + ''' + try : + LICENCE_FILE=os.environ["DISTENE_LICENCE_FILE_FOR_MGCLEANER"] + except: + LICENCE_FILE='' + try : + PATH=os.environ["DISTENE_PATH_FOR_MGCLEANER"] + except: + PATH='' + if LICENCE_FILE != '': + cmds+='source '+LICENCE_FILE+'\n' + else: + cmds+="# $DISTENE_LICENCE_FILE_FOR_MGCLEANER NOT SET\n" + if PATH != '': + cmds+='export PATH='+PATH+':$PATH\n' + else: + cmds+="# $DISTENE_PATH_FOR_MGCLEANER NOT SET\n" + #cmds+='env\n' cmds+='rm -f '+self.parent().fichierOut+'\n' + ''' cmds+=txt+'\n' cmds+='echo END_OF_MGCleaner\n' - pid=self.monExe.pid() - nomFichier='/tmp/MGCleaner_'+str(pid)+'.sh' + ext='' + if sys.platform == "win32": + ext = '.bat' + else: + ext = '.sh' + nomFichier=tempfile.mktemp(suffix=ext,prefix="MGCleaner_") f=open(nomFichier,'w') f.write(cmds) f.close() - maBidouille='sh ' + nomFichier + maBidouille=nomFichier self.monExe.start(maBidouille) self.monExe.closeWriteChannel() self.enregistreResultatsDone=False