From: Christophe Bourcier <christophe.bourcier@cea.fr>
Date: Wed, 16 Jan 2019 13:18:24 +0000 (+0100)
Subject: Fix to allow Cleaner and SurfOpt to be launched on files with special characters... 
X-Git-Tag: V9_2_1~4
X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=commitdiff_plain;h=c9afb20072e07eeea02c562e119a69e854d60ffb

Fix to allow Cleaner and SurfOpt to be launched on files with special characters on Windows.
Do not use an intermediate bat file to prevent bad unicode conversions.
---

diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
index f2647a3fb..0271821e3 100644
--- a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
+++ b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
@@ -67,33 +67,10 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog):
           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))
+        if os.path.exists(self.parent().fichierOut):
+            os.remove(self.parent().fichierOut)
         
-        self.monExe.start(nomFichier)
+        self.monExe.start(txt)
         self.monExe.closeWriteChannel()
         self.enregistreResultatsDone=False
         self.show()
diff --git a/src/Tools/YamsPlug/monViewText.py b/src/Tools/YamsPlug/monViewText.py
index 9d92a0c55..afbc87e3b 100644
--- a/src/Tools/YamsPlug/monViewText.py
+++ b/src/Tools/YamsPlug/monViewText.py
@@ -55,33 +55,10 @@ class MonViewText(Ui_ViewExe, QDialog):
         self.monExe.readyReadStandardError.connect( self.readFromStdErr )
         self.monExe.finished.connect( self.finished )
 
-        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-surfopt.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'
+        if os.path.exists(self.parent().fichierOut):
+            os.remove(self.parent().fichierOut)
 
-        cmds += 'echo %s\n' % txt #to see what is compute command
-        cmds += txt+'\n'
-        cmds += 'echo "END_OF_MGSurfOpt"\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: MGSurfOpt launch script file: %s" % nomFichier))
-
-        self.monExe.start(nomFichier)
+        self.monExe.start(txt)
         self.monExe.closeWriteChannel()
         self.enregistreResultatsDone=False
         self.show()