From eb7ef63636ee16b64d621650b6db474852321652 Mon Sep 17 00:00:00 2001 From: Pierre Ratinaud Date: Sun, 14 Sep 2014 15:24:00 +0200 Subject: [PATCH] ... --- corpus.py | 5 +++++ iramuteq.py | 7 +++---- 2 files changed, 8 insertions(+), 4 deletions(-) diff --git a/corpus.py b/corpus.py index e34233a..ec4855b 100644 --- a/corpus.py +++ b/corpus.py @@ -1545,6 +1545,9 @@ class SubBuilder : self.ori = corpus self.dlg = dlg corpus_name = 'Sub' + corpus.parametres['corpus_name'] + if dlg is not None : + busy = wx.BusyInfo(_("Please wait...").decode('utf8'), self) + wx.SafeYield() parametres['corpus_name'] = corpus_name if parametres.get('frommeta', False) : parametres['meta'] = corpus.make_etoiles() @@ -1553,6 +1556,8 @@ class SubBuilder : else : parametres['meta'] = [] parametres['meta'].sort() + if dlg is not None : + del busy dial = SubTextFromMetaDial(parent, parametres) self.res = dial.ShowModal() if self.res == 5100 : diff --git a/iramuteq.py b/iramuteq.py index f64e1b5..21453e9 100644 --- a/iramuteq.py +++ b/iramuteq.py @@ -601,16 +601,15 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences.""" def OnSubText(self, corpus, parametres = None): if corpus is None : corpus = self.tree.getcorpus() - busy = wx.BusyInfo(_("Please wait...").decode('utf8'), self) - wx.SafeYield() builder = SubBuilder(self, corpus, parametres) - del busy if builder.res == wx.ID_OK : + busy = wx.BusyInfo(_("Please wait...").decode('utf8'), self) + wx.SafeYield() corpus = builder.doanalyse() - print corpus.parametres['uuid'] self.history.add(corpus.parametres) self.tree.OnItemAppend(corpus.parametres) OpenAnalyse(self, corpus.parametres) + del busy def OpenText(self): dlg = wx.ProgressDialog("Ouverture...", -- 2.7.4