...

[iramuteq] / analysetxt.py

diff --git a/analysetxt.py b/analysetxt.py
index 95fcfa2..cc99482 100644 (file)
--- a/analysetxt.py
+++ b/analysetxt.py
@@ -5,7 +5,7 @@
 
 import logging
 from chemins import PathOut
-from functions import exec_rcode, check_Rresult, DoConf, ReadDicoAsDico
+from functions import exec_rcode, check_Rresult, DoConf, ReadDicoAsDico, progressbar
 from shutil import copy
 from time import time, sleep
 from uuid import uuid4
@@ -57,6 +57,8 @@ class AnalyseText :
                 copy(self.parametres['dictionary'], dictpath)
                 self.parametres['dictionary'] = dictpath
             self.corpus.parse_active(gramact, gramsup)
+            if dlg :
+                self.dlg = progressbar(self.ira, dlg)
             result_analyse = self.doanalyse()
             if result_analyse is None :
                 self.time = time() - self.t1
@@ -67,17 +69,22 @@ class AnalyseText :
                 DoConf().makeoptions([self.parametres['type']], [self.parametres], self.pathout['Analyse.ira'])
                 self.ira.history.add(self.parametres)
                 if dlg :
-                    dlg.Destroy()
+                    if not isinstance(dlg, int) :
+                        dlg.Destroy()
+                    self.dlg.Destroy()
                     OpenAnalyse(self.parent, self.parametres['ira'])
                     self.ira.tree.AddAnalyse(self.parametres)
                     self.val = 5100
             else :
                 self.val = False
                 if dlg :
-                    dlg.Destroy()
+                    try :
+                        self.dlg.Destroy()
+                    except :
+                        pass
         else :
-            if dlg :
-                dlg.Destroy()
+            #if isinstance(dlg, wx.ProgressDialog) :
+            #    self.dlg.Destroy()
             self.val = False
 
     def doanalyse(self) :