X-Git-Url: http://git.salome-platform.org/gitweb/?p=modules%2Fsmesh.git;a=blobdiff_plain;f=src%2FTools%2FMGCleanerPlug%2FMGCleanerMonViewText.py;h=c45e4cdf5244f817c2ccabb2a19077e4d69536f8;hp=0271821e35f640bcaffabceb0f05649cd1493c0f;hb=0fc0831670e27a5611b941c52dc152fd63964515;hpb=c9afb20072e07eeea02c562e119a69e854d60ffb

diff --git a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
index 0271821e3..c45e4cdf5 100644
--- a/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
+++ b/src/Tools/MGCleanerPlug/MGCleanerMonViewText.py
@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-# Copyright (C) 2013-2016  EDF R&D
+# Copyright (C) 2013-2020  EDF R&D
 #
 # This library is free software; you can redistribute it and/or
 # modify it under the terms of the GNU Lesser General Public
@@ -37,19 +37,24 @@ 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 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 )
+        self.monExe.errorOccurred.connect( self.errorOccured )
 
-        """ 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])
-        """
-        
         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):
@@ -103,13 +102,32 @@ class MGCleanerMonViewText(Ui_ViewExe, QDialog):
         a=self.monExe.readAllStandardOutput()
         aa=a.data().decode(errors='ignore')
         self.TB_Exe.append(aa)
-    
+
     def finished(self):
-        self.parent().enregistreResultat()
-        self.enregistreResultatsDone=True
-    
+        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()
+        elif not self.hasBeenCanceled:
+            if os.path.exists(self.parent().fichierOut):
+                self.parent().enregistreResultat()
+                QMessageBox.critical(self, 'Computation ended in error',
+                  'A new mesh has been generated but with some errors.'+
+                  '<br>Please, check the log message.')
+            else:
+                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()
+        self.close()