X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=textwordcloud.py;fp=textwordcloud.py;h=01ccf9ac6e4d93ac61b5f9a0e0a026f5d1485d1d;hp=9e358720ce16bc0018386eaccce9b17a4de92635;hb=a503f041dc4947ee21c1d353ddd05ddb13a5e322;hpb=81594f689f1e191599d96a2a503fbb5529df69d7

diff --git a/textwordcloud.py b/textwordcloud.py
index 9e35872..01ccf9a 100644
--- a/textwordcloud.py
+++ b/textwordcloud.py
@@ -26,7 +26,13 @@ class WordCloud(AnalyseText):
     def doanalyse(self) :
         self.parametres['type'] = 'wordcloud'
         #FIXME
-        self.actives = self.corpus.make_actives_limit(3)        
+        limit = 3
+        mode = 'both'
+        if mode == 'both' :
+            self.actives = self.corpus.make_actives_limit(limit, 1)
+            self.actives += self.corpus.make_actives_limit(limit, 2)
+        elif mode == 'act' :
+            self.actives = self.corpus.make_actives_limit(limit, 1)
         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'])
         self.make_option()
@@ -43,6 +49,7 @@ class WordCloud(AnalyseText):
             self.parametres['width'] = dial.spin_L.GetValue()
             self.parametres['height'] = dial.spin_H.GetValue()
             #maxword = dial.spin_maxword.GetValue()
+            self.parametres['maxword'] = dial.spin_maxword.GetValue()
             self.parametres['mincex'] = float(dial.spin_mincex.GetValue())/float(10)
             self.parametres['maxcex'] = float(dial.spin_maxcex.GetValue())/float(10)
             self.parametres['col_text'] = dial.color_text.GetColour()