Salome HOME
projects
/
modules
/
smesh.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix regression caused by commit 67312ab9
[modules/smesh.git]
/
src
/
Tools
/
YamsPlug
/
monViewText.py
diff --git
a/src/Tools/YamsPlug/monViewText.py
b/src/Tools/YamsPlug/monViewText.py
index 45115e68dfdcac3239f33184f93351e92fb1e196..c1e90255b6e7a8bd3704d0acc589401956a25875 100644
(file)
--- a/
src/Tools/YamsPlug/monViewText.py
+++ b/
src/Tools/YamsPlug/monViewText.py
@@
-53,11
+53,14
@@
class MonViewText(Ui_ViewExe, QDialog):
self.monExe.readyReadStandardOutput.connect( self.readFromStdOut )
self.monExe.readyReadStandardError.connect( self.readFromStdErr )
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 = ''
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'
else:
cmds += '#!/bin/bash\n'
cmds += 'pwd\n'
@@
-109,11
+112,11
@@
class MonViewText(Ui_ViewExe, QDialog):
def readFromStdOut(self) :
a=self.monExe.readAllStandardOutput()
aa=unicode(a.data())
def readFromStdOut(self) :
a=self.monExe.readAllStandardOutput()
aa=unicode(a.data())
- self.TB_Exe.append(aa)
- if "END_OF_MGSurfOpt" in aa:
- self.parent().enregistreResultat()
- self.enregistreResultatsDone=True
- #self.theClose()
+ self.TB_Exe.append(aa)
+
+ def finished(self):
+ self.parent().enregistreResultat()
+ self.enregistreResultatsDone=True
def theClose(self):
if not self.enregistreResultatsDone:
def theClose(self):
if not self.enregistreResultatsDone: