X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=analysetxt.py;h=33f7d123c914d934e947ed120e8dabf3dbaf7dbf;hp=e744b64ae407f361ba856e2fae8ecb6d3480ea87;hb=4dc1de2e438378f357bcbb2fd8cf0075e0bdcd55;hpb=c53744151df01b2a1d9181a30e12180d47e94012 diff --git a/analysetxt.py b/analysetxt.py index e744b64..33f7d12 100644 --- a/analysetxt.py +++ b/analysetxt.py @@ -31,7 +31,6 @@ class AnalyseText : else : self.pathout = PathOut(filename=corpus.parametres['originalpath'], dirout=self.parametres['pathout'], analyse_type=self.parametres['type']) self.parametres = self.lemparam() - if self.parametres is not None : self.parametres = self.make_config(parametres) log.info(self.pathout.dirout) @@ -70,6 +69,8 @@ class AnalyseText : DoConf().makeoptions([self.parametres['type']], [self.parametres], self.pathout['Analyse.ira']) self.ira.history.add(self.parametres) if dlg : + if not isinstance(dlg, int) : + dlg.Destroy() self.dlg.Destroy() OpenAnalyse(self.parent, self.parametres['ira']) self.ira.tree.AddAnalyse(self.parametres) @@ -79,8 +80,8 @@ class AnalyseText : if dlg : self.dlg.Destroy() else : - if dlg : - self.dlg.Destroy() + #if isinstance(dlg, wx.ProgressDialog) : + # self.dlg.Destroy() self.val = False def doanalyse(self) :