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
Merge remote-tracking branch 'origin/V8_3_BR' into ngr/python3_dev
[modules/smesh.git]
/
src
/
Tools
/
MGCleanerPlug
/
MGCleanerMonViewText.py
diff --git
a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
index 86972fa312d667bb17aefbe8bbc85d0f7531909a..99e322d3111813d8c56f8c520653485f48c585e1 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.readyReadStandardOutput.connect( self.readFromStdOut )
self.monExe.readyReadStandardError.connect( self.readFromStdErr )
+ self.monExe.finished.connect( self.finished )
""" for test set environment
env = QProcessEnvironment().systemEnvironment()
""" for test set environment
env = QProcessEnvironment().systemEnvironment()
@@
-69,7
+70,8
@@
class MGCleanerMonViewText(Ui_ViewExe, QDialog):
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'
ext = '.bat'
else:
cmds += '#!/bin/bash\n'
@@
-89,7
+91,7
@@
class MGCleanerMonViewText(Ui_ViewExe, QDialog):
f.write(cmds)
self.make_executable(nomFichier)
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()
self.monExe.start(nomFichier)
self.monExe.closeWriteChannel()
@@
-106,28
+108,28
@@
class MGCleanerMonViewText(Ui_ViewExe, QDialog):
savedir=os.environ['HOME']
fn = QFileDialog.getSaveFileName(None, self.trUtf8("Save File"),savedir)
if fn.isNull() : return
savedir=os.environ['HOME']
fn = QFileDialog.getSaveFileName(None, self.trUtf8("Save File"),savedir)
if fn.isNull() : return
- ulfile = os.path.abspath(
unicode
(fn))
+ ulfile = os.path.abspath(
str
(fn))
try:
f = open(fn, 'wb')
f.write(str(self.TB_Exe.toPlainText()))
f.close()
try:
f = open(fn, 'wb')
f.write(str(self.TB_Exe.toPlainText()))
f.close()
- except IOError
,
why:
+ except IOError
as
why:
QMessageBox.critical(self, self.trUtf8('Save File'),
self.trUtf8('The file <b>%1</b> could not be saved.<br>Reason: %2')
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)))
+ .arg(
str
(fn)).arg(str(why)))
def readFromStdErr(self):
a=self.monExe.readAllStandardError()
def readFromStdErr(self):
a=self.monExe.readAllStandardError()
- self.TB_Exe.append(
unicode
(a.data()))
+ self.TB_Exe.append(
str
(a.data()))
def readFromStdOut(self) :
a=self.monExe.readAllStandardOutput()
def readFromStdOut(self) :
a=self.monExe.readAllStandardOutput()
- aa=
unicode
(a.data())
+ aa=
str
(a.data())
self.TB_Exe.append(aa)
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:
def theClose(self):
if not self.enregistreResultatsDone: