# -*- coding: utf-8 -*-
#Author: Pierre Ratinaud
#Copyright (c) 2008-2009 Pierre Ratinaud
-#Lisense: GNU/GPL
+#License: GNU/GPL
from analysetxt import AnalyseText
from guifunct import getPage, getCorpus, SelectColumn
-from ConfigParser import RawConfigParser
-from functions import sortedby, progressbar, CreateIraFile, exec_rcode, check_Rresult, MessageImage
+#from ConfigParser import RawConfigParser
+from functions import sortedby, progressbar
from dialog import StatDialog, PrefWordCloud
from PrintRScript import WordCloudRScript
#from ttparser import *
import tempfile
-from time import sleep
+#from time import sleep
import wx
import os
import logging
self.parametres['type'] = 'wordcloud'
#FIXME
limit = 3
+ self.dlg.Destroy()
res = self.make_option()
if res == wx.ID_OK :
if self.parametres['mode'] == 2 :
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'
- def make_option(self) :
- dial = PrefWordCloud(self.ira)
+ def make_option(self, fromcluster = False) :
+ dial = PrefWordCloud(self.ira, fromcluster)
dial.CenterOnParent()
res = dial.ShowModal()
if res == wx.ID_OK :
self.parametres['col_bg'] = dial.color_bg.GetColour()
self.parametres['mode'] = dial.typeformeschoice.GetSelection()
self.parametres['svg'] = svg
+ if fromcluster :
+ self.parametres['indice'] = dial.indice.GetSelection()
outgraph = os.path.join(os.path.dirname(self.pathout['zipf.png']), 'nuage_')
nb = 1
if svg :
self.parametres['type'] = 'clustercloud'
#FIXME
limit = 2
- res = self.make_option()
+ res = self.make_option(True)
if res == wx.ID_OK :
prof = self.parametres['clusterprof']
del self.parametres['clusterprof']
- if self.parametres.get('unit', 0) == 0 :
+ if self.parametres['indice'] == 0 :
tokeep = 1
else :
tokeep = 2