X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=textwordcloud.py;h=6f75498c546f6210f95a7d88f4aeced14616b180;hp=fab7c5a1c0ecba610a0ed82fea6e65e0747b34f2;hb=148fe710bf14981c45e865e8b4ddb68333e62f7c;hpb=6523e3596df7ec9b7b94b875593953d4b34b6117

diff --git a/textwordcloud.py b/textwordcloud.py
index fab7c5a..6f75498 100644
--- a/textwordcloud.py
+++ b/textwordcloud.py
@@ -25,6 +25,7 @@ class WordCloud(AnalyseText):
         self.parametres['type'] = 'wordcloud'
         #FIXME
         limit = 3
+        self.dlg.Destroy()
         res = self.make_option()
         if res == wx.ID_OK :
             if self.parametres['mode'] == 2 :
@@ -35,11 +36,15 @@ class WordCloud(AnalyseText):
             elif self.parametres['mode'] == 1 :
                 self.actives = self.corpus.make_actives_limit(limit, 2)
             dictcol = dict([[i, [act, self.corpus.getlemeff(act)]] for i, act in enumerate(self.actives)]) 
-            SelectColumn(self.ira, dictcol, self.actives, self.pathout['selected.csv'], dlg = True)
-            self.make_wordcloud()
-            script = WordCloudRScript(self)
-            script.make_script()
-            self.doR(script.scriptout, dlg = self.dlg, message = 'R...')
+            selectcol = SelectColumn(self.ira, dictcol, self.actives, self.pathout['selected.csv'], dlg = True)
+            if selectcol.ok :
+                self.dlg = progressbar(self.ira, 2)
+                self.make_wordcloud()
+                script = WordCloudRScript(self)
+                script.make_script()
+                self.doR(script.scriptout, dlg = self.dlg, message = 'R...')
+            else :
+                return 'NOK'
         else :
             return 'NOK'