ForkMaster/smesh
1
0
Fork 0
mirror of https://git.salome-platform.org/gitpub/modules/smesh.git synced 2024-12-26 09:20:34 +05:00
Code Issues Packages Projects Releases Wiki Activity

Improve behaviour of Cleaner and SurfOpt in case of error and add a cancel button.

Browse Source
This commit is contained in:
Christophe Bourcier 2019-01-22 15:32:06 +01:00 committed by vsr
parent c9afb20072
commit 47242d5934
4 changed files with 82 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
View File

@ -44,12 +44,17 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog):
"""
Classe permettant la visualisation de texte
"""
def __init__(self, parent, txt, ):
def __init__(self, parent, txt):
QDialog.__init__(self,parent)
self.setupUi(self)
self.resize( QSize(1000,600).expandedTo(self.minimumSizeHint()) )
#self.connect( self.PB_Ok,SIGNAL("clicked()"), self, SLOT("close()") )
self.PB_Ok.clicked.connect( self.theClose )
# Button OK is disabled until computation is finished
self.PB_Ok.setEnabled(False)
# Button cancel allows to kill the computation
# It is disabled when the computation is finished
self.PB_Cancel.clicked.connect( self.cancelComputation )
self.PB_Cancel.setToolTip("Cancel computation")
self.PB_Save.clicked.connect( self.saveFile )
self.PB_Save.setToolTip("Save trace in log file")
self.PB_Ok.setToolTip("Close view")
@ -58,21 +63,15 @@ 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()
env.insert("HELLO", "bonjour") #Add an environment variable for debug
self.monExe.setProcessEnvironment(env)
if verbose:
PP.pprint([str(i) for i in sorted(self.monExe.processEnvironment().toStringList()) if 'DISTENE' in i])
"""
self.monExe.errorOccurred.connect( self.errorOccured )
if os.path.exists(self.parent().fichierOut):
os.remove(self.parent().fichierOut)
self.monExe.start(txt)
self.monExe.closeWriteChannel()
self.enregistreResultatsDone=False
self.hasBeenCanceled = False
self.anErrorOccured = False
self.show()
def make_executable(self, path):
@ -105,11 +104,24 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog):
self.TB_Exe.append(aa)
def finished(self):
self.PB_Ok.setEnabled(True)
self.PB_Cancel.setEnabled(False)
exit_code = self.monExe.exitCode()
if exit_code == 0 and not self.anErrorOccured:
self.parent().enregistreResultat()
self.enregistreResultatsDone=True
elif not self.hasBeenCanceled:
QMessageBox.critical(self, 'Computation failed',
'The computation has failed.<br>Please, check the log message.')
pass
def errorOccured(self):
# for instance if the executable is not found
self.anErrorOccured = True
self.finished()
def cancelComputation(self):
self.hasBeenCanceled = True
self.monExe.kill()
def theClose(self):
if not self.enregistreResultatsDone:
self.parent().enregistreResultat()
self.enregistreResultatsDone=True
self.close()

11
src/Tools/MGCleanerPlug/MGCleanerViewText.ui
View File

@ -14,7 +14,7 @@
<string>Run MGCleaner</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
<item row="0" column="0" colspan="3">
<widget class="QTextBrowser" name="TB_Exe"/>
</item>
<item row="1" column="0">
@ -25,9 +25,16 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="PB_Cancel">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="PB_Save">
<property name="text">
<string>Save</string>
<string>Save log</string>
</property>
</widget>
</item>

13
src/Tools/YamsPlug/ViewText.ui
View File

@ -11,10 +11,10 @@
</rect>
</property>
<property name="windowTitle">
<string>Run Yams</string>
<string>Run MGCleaner</string>
</property>
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0" colspan="2">
<item row="0" column="0" colspan="3">
<widget class="QTextBrowser" name="TB_Exe"/>
</item>
<item row="1" column="0">
@ -25,9 +25,16 @@
</widget>
</item>
<item row="1" column="1">
<widget class="QPushButton" name="PB_Cancel">
<property name="text">
<string>Cancel</string>
</property>
</widget>
</item>
<item row="1" column="2">
<widget class="QPushButton" name="PB_Save">
<property name="text">
<string>Save</string>
<string>Save log</string>
</property>
</widget>
</item>

35
src/Tools/YamsPlug/monViewText.py
View File

@ -29,6 +29,7 @@ import pprint as PP #pretty print
from qtsalome import *
# Import des panels
from ViewText_ui import Ui_ViewExe
verbose = True
@ -46,21 +47,30 @@ class MonViewText(Ui_ViewExe, QDialog):
QDialog.__init__(self,parent)
self.setupUi(self)
self.resize( QSize(1000,600).expandedTo(self.minimumSizeHint()) )
# self.PB_Ok.clicked.connect(self.close)
self.PB_Ok.clicked.connect( self.theClose )
# Button OK is disabled until computation is finished
self.PB_Ok.setEnabled(False)
# Button cancel allows to kill the computation
# It is disabled when the computation is finished
self.PB_Cancel.clicked.connect( self.cancelComputation )
self.PB_Cancel.setToolTip("Cancel computation")
self.PB_Save.clicked.connect( self.saveFile )
self.PB_Save.setToolTip("Save trace in log file")
self.PB_Ok.setToolTip("Close view")
self.monExe=QProcess(self)
self.monExe.readyReadStandardOutput.connect( self.readFromStdOut )
self.monExe.readyReadStandardError.connect( self.readFromStdErr )
self.monExe.finished.connect( self.finished )
self.monExe.errorOccurred.connect( self.errorOccured )
if os.path.exists(self.parent().fichierOut):
os.remove(self.parent().fichierOut)
self.monExe.start(txt)
self.monExe.closeWriteChannel()
self.enregistreResultatsDone=False
self.hasBeenCanceled = False
self.anErrorOccured = False
self.show()
def make_executable(self, path):
@ -93,11 +103,24 @@ class MonViewText(Ui_ViewExe, QDialog):
self.TB_Exe.append(aa)
def finished(self):
self.PB_Ok.setEnabled(True)
self.PB_Cancel.setEnabled(False)
exit_code = self.monExe.exitCode()
if exit_code == 0 and not self.anErrorOccured:
self.parent().enregistreResultat()
self.enregistreResultatsDone=True
elif not self.hasBeenCanceled:
QMessageBox.critical(self, 'Computation failed',
'The computation has failed.<br>Please, check the log message.')
pass
def errorOccured(self):
# for instance if the executable is not found
self.anErrorOccured = True
self.finished()
def cancelComputation(self):
self.hasBeenCanceled = True
self.monExe.kill()
def theClose(self):
if not self.enregistreResultatsDone:
self.parent().enregistreResultat()
self.enregistreResultatsDone=True
self.close()