More fixes in Cleaner and SurfOpt:

[modules/smesh.git] / src / Tools / YamsPlug / monViewText.py

diff --git a/src/Tools/YamsPlug/monViewText.py b/src/Tools/YamsPlug/monViewText.py
index 426467ef4351d3380656ef528ee70de52fc34016..9d92a0c55a7eac476d31cc47d38bc3f10d865d62 100644 (file)
--- a/src/Tools/YamsPlug/monViewText.py
+++ b/src/Tools/YamsPlug/monViewText.py
@@ -35,8 +35,8 @@ verbose = True
 
 force = os.getenv("FORCE_DISTENE_LICENSE_FILE")
 if force != None:
-  os.environ["DISTENE_LICENSE_FILE"] = force
-  os.environ["DLIM8VAR"] = "NOTHING"
+    os.environ["DISTENE_LICENSE_FILE"] = force
+    os.environ["DLIM8VAR"] = "NOTHING"
 
 class MonViewText(Ui_ViewExe, QDialog):
     """
@@ -53,11 +53,14 @@ class MonViewText(Ui_ViewExe, QDialog):
 
         self.monExe.readyReadStandardOutput.connect( self.readFromStdOut )
         self.monExe.readyReadStandardError.connect( self.readFromStdErr )
-      
+        self.monExe.finished.connect( self.finished )
+
         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'
             cmds += 'pwd\n'
@@ -70,14 +73,14 @@ class MonViewText(Ui_ViewExe, QDialog):
         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)
+            f.write(cmds)
         self.make_executable(nomFichier)
-        
-        if verbose: print("INFO: MGSurfOpt launch script file: %s" % nomFichier)
-        
+
+        if verbose: print(("INFO: MGSurfOpt launch script file: %s" % nomFichier))
+
         self.monExe.start(nomFichier)
         self.monExe.closeWriteChannel()
         self.enregistreResultatsDone=False
@@ -91,32 +94,33 @@ class MonViewText(Ui_ViewExe, QDialog):
     def saveFile(self):
         #recuperation du nom du fichier
         savedir=os.environ['HOME']
-        fn = QFileDialog.getSaveFileName(None,"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, 'Save File',
-               'The file <b>%1</b> could not be saved.<br>Reason: %2'%(unicode(fn), 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().encode()))
+        aa=a.data().decode(errors='ignore')
+        self.TB_Exe.append(aa)
 
     def readFromStdOut(self) :
         a=self.monExe.readAllStandardOutput()
-        aa=unicode(a.data(),len(a))
+        aa=a.data().decode(errors='ignore')
         self.TB_Exe.append(aa)
-        if "END_OF_MGSurfOpt" in aa:
-          self.parent().enregistreResultat()
-          self.enregistreResultatsDone=True
-          #self.theClose()
-    
-    def theClose(self):
-      if not self.enregistreResultatsDone:
+
+    def finished(self):
         self.parent().enregistreResultat()
         self.enregistreResultatsDone=True
-      self.close()
+
+    def theClose(self):
+        if not self.enregistreResultatsDone:
+            self.parent().enregistreResultat()
+            self.enregistreResultatsDone=True
+        self.close()