X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FMGCleanerPlug%2FMGCleanerMonViewText.py;h=01c53069d800ac41fd37ef4e0ba6393f8e8ed5de;hp=81a2c26a825038d139a3e0900b521ebda0d58d52;hb=62336a394b80b503991ff801f2ebf7feff47e7f0;hpb=eb75a450cceabb83064e079ca4f907bde33b38de

diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
index 81a2c26a8..01c53069d 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,8 +19,13 @@
 #
 
 # Modules Python
-import string,types,os
+import os
+import sys
+import string
+import types
+import tempfile
 import traceback
+import pprint as PP #pretty print
 
 from qtsalome import *
 
@@ -28,6 +33,13 @@ from qtsalome import *
 
 from MGCleanerViewText_ui import Ui_ViewExe
 
+verbose = True
+
+force = os.getenv("FORCE_DISTENE_LICENSE_FILE")
+if force != None:
+  os.environ["DISTENE_LICENSE_FILE"] = force
+  os.environ["DLIM8VAR"] = "NOTHING"
+
 class MGCleanerMonViewText(Ui_ViewExe, QDialog):
     """
     Classe permettant la visualisation de texte
@@ -45,25 +57,52 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog):
 
         self.monExe.readyReadStandardOutput.connect( self.readFromStdOut )
         self.monExe.readyReadStandardError.connect( self.readFromStdErr )
-      
-        # Je n arrive pas a utiliser le setEnvironment du QProcess
-        # fonctionne hors Salome mais pas dans Salome ???
-        cmds=''
-        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'
-        f=open(nomFichier,'w')
-        f.write(cmds)
-        f.close()
+        self.monExe.finished.connect( self.finished )
 
-        maBidouille='sh ' + nomFichier
-        self.monExe.start(maBidouille)
+        """ for test set environment
+        env = QProcessEnvironment().systemEnvironment()
+        env.insert("HELLO", "bonjour") #Add an environment variable for debug
+        self.monExe.setProcessEnvironment(env)
+        if verbose: 
+          PP.pprint([str(i) for i in sorted(self.monExe.processEnvironment().toStringList()) if 'DISTENE' in i])
+        """
+        
+        cmds = ''
+        ext = ''
+        if sys.platform == "win32":
+            if os.path.exists(self.parent().fichierOut):
+                cmds += 'del %s\n' % self.parent().fichierOut
+            ext = '.bat'
+        else:
+            cmds += '#!/bin/bash\n'
+            cmds += 'pwd\n'
+            #cmds += 'which mg-cleaner.exe\n'
+            cmds += 'echo "DISTENE_LICENSE_FILE="$DISTENE_LICENSE_FILE\n'
+            cmds += 'echo "DLIM8VAR="$DLIM8VAR\n'
+            cmds += 'rm -f %s\n' % self.parent().fichierOut
+            ext = '.bash'
+
+        cmds += 'echo %s\n' % txt #to see what is compute command
+        cmds += txt+'\n'
+        cmds += 'echo "END_OF_MGCleaner"\n'
+        
+        nomFichier = os.path.splitext(self.parent().fichierOut)[0] + ext
+        with open(nomFichier, 'w') as f:
+          f.write(cmds)
+        self.make_executable(nomFichier)
+        
+        if verbose: print("INFO: MGCleaner launch script file: %s" % nomFichier)
+        
+        self.monExe.start(nomFichier)
         self.monExe.closeWriteChannel()
         self.enregistreResultatsDone=False
         self.show()
 
+    def make_executable(self, path):
+        mode = os.stat(path).st_mode
+        mode |= (mode & 0o444) >> 2    # copy R bits to X
+        os.chmod(path, mode)
+
     def saveFile(self):
         #recuperation du nom du fichier
         savedir=os.environ['HOME']
@@ -87,10 +126,10 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog):
         a=self.monExe.readAllStandardOutput()
         aa=unicode(a.data())
         self.TB_Exe.append(aa)
-        if "END_OF_MGCleaner" in aa:
-          self.parent().enregistreResultat()
-          self.enregistreResultatsDone=True
-          #self.theClose()
+    
+    def finished(self):
+        self.parent().enregistreResultat()
+        self.enregistreResultatsDone=True
     
     def theClose(self):
       if not self.enregistreResultatsDone: