More fixes in Cleaner and SurfOpt:

[modules/smesh.git] / src / Tools / MGCleanerPlug / MGCleanerMonViewText.py

diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
index 86972fa312d667bb17aefbe8bbc85d0f7531909a..f2647a3fb99e9de51f7832cc6684d3973abf8bee 100644 (file)
--- a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
+++ b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
@@ -57,6 +57,7 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog):
 
         self.monExe.readyReadStandardOutput.connect( self.readFromStdOut )
         self.monExe.readyReadStandardError.connect( self.readFromStdErr )
+        self.monExe.finished.connect( self.finished )
 
         """ for test set environment
         env = QProcessEnvironment().systemEnvironment()
@@ -69,7 +70,8 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog):
         cmds = ''
         ext = ''
         if sys.platform == "win32":
-            cmds += 'delete %s\n' % self.parent().fichierOut
+            if os.path.exists(self.parent().fichierOut):
+                cmds += 'del %s\n' % self.parent().fichierOut
             ext = '.bat'
         else:
             cmds += '#!/bin/bash\n'
@@ -89,7 +91,7 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog):
           f.write(cmds)
         self.make_executable(nomFichier)
         
-        if verbose: print("INFO: MGCleaner launch script file: %s" % nomFichier)
+        if verbose: print(("INFO: MGCleaner launch script file: %s" % nomFichier))
         
         self.monExe.start(nomFichier)
         self.monExe.closeWriteChannel()
@@ -104,30 +106,30 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog):
     def saveFile(self):
         #recuperation du nom du fichier
         savedir=os.environ['HOME']
-        fn = QFileDialog.getSaveFileName(None, self.trUtf8("Save File"),savedir)
-        if fn.isNull() : return
-        ulfile = os.path.abspath(unicode(fn))
+        fn, mask = QFileDialog.getSaveFileName(None,"Save File",savedir)
+        if not fn: return
+        ulfile = os.path.abspath(str(fn))
         try:
-           f = open(fn, 'wb')
-           f.write(str(self.TB_Exe.toPlainText()))
-           f.close()
-        except IOError, why:
-           QMessageBox.critical(self, self.trUtf8('Save File'),
-                self.trUtf8('The file <b>%1</b> could not be saved.<br>Reason: %2')
-                    .arg(unicode(fn)).arg(str(why)))
+            f = open(fn, 'wb')
+            f.write(self.TB_Exe.toPlainText().encode("utf-8"))
+            f.close()
+        except IOError as why:
+            QMessageBox.critical(self, 'Save File',
+                 'The file <b>%s</b> could not be saved.<br>Reason: %s'%(str(fn), str(why)))
 
     def readFromStdErr(self):
         a=self.monExe.readAllStandardError()
-        self.TB_Exe.append(unicode(a.data()))
+        aa=a.data().decode(errors='ignore')
+        self.TB_Exe.append(aa)
 
     def readFromStdOut(self) :
         a=self.monExe.readAllStandardOutput()
-        aa=unicode(a.data())
+        aa=a.data().decode(errors='ignore')
         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: