From 733276c6f76d930f6772878442bc3cac5f6af553 Mon Sep 17 00:00:00 2001 From: ctn Date: Wed, 28 Oct 2015 13:38:46 +0100 Subject: [PATCH] Variables for MGCleaner/Yams are already set in the Salome environment --- src/Tools/MGCleanerPlug/MGCleanerMonViewText.py | 17 ----------------- src/Tools/YamsPlug/monViewText.py | 17 ----------------- 2 files changed, 34 deletions(-) diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py index 64179ae4c..df1076832 100644 --- a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py +++ b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py @@ -51,23 +51,6 @@ 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' diff --git a/src/Tools/YamsPlug/monViewText.py b/src/Tools/YamsPlug/monViewText.py index 35171babb..7b518b574 100644 --- a/src/Tools/YamsPlug/monViewText.py +++ b/src/Tools/YamsPlug/monViewText.py @@ -49,23 +49,6 @@ class MonViewText(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_YAMS"] - except: - LICENCE_FILE='' - try : - PATH=os.environ["DISTENE_PATH_FOR_YAMS"] - except: - PATH='' - if LICENCE_FILE != '': - cmds+='source '+LICENCE_FILE+'\n' - else: - cmds+="# $DISTENE_LICENCE_FILE_FOR_YAMS NOT SET\n" - if PATH != '': - cmds+='export PATH='+PATH+':$PATH\n' - else: - cmds+="# $DISTENE_PATH_FOR_YAMS NOT SET\n" - #cmds+='env\n' cmds+='rm -f '+self.parent().fichierOut+'\n' cmds+=txt+'\n' cmds+='echo END_OF_Yams\n' -- 2.30.2