# -*- coding: utf-8 -*-
#Author: Pierre Ratinaud
#Copyright (c) 2008-2013 Pierre Ratinaud
-#Lisense: GNU/GPL
+#License: GNU/GPL
from chemins import ffr, simipath
#from corpus import Corpus
from analysetxt import AnalyseText
#from ConfigParser import RawConfigParser
#from guifunct import getPage, getCorpus
-from dialog import StatDialog
-from guifunct import SelectColumn, PrepSimi
+from guifunct import PrepSimi
from functions import indices_simi, progressbar, treat_var_mod, read_list_file, print_liste
#from tableau import Tableau
#from tabsimi import DoSimi
self.parametres['type'] = 'simitxt'
self.pathout.basefiles(simipath)
self.indices = indices_simi
- self.makesimiparam()
+ if self.dlg :
+ self.makesimiparam()
#FIXME
self.actives = self.corpus.make_actives_limit(3)
dictcol = dict([[i, [act, self.corpus.getlemeff(act)]] for i, act in enumerate(self.actives)])
continu = False
if self.dlg :
- #cont = SelectColumn(self.ira, dictcol, self.actives, self.pathout['selected.csv'], dlg = self.dlg)
- #if cont.ok :
self.listet = self.corpus.make_etoiles()
self.listet.sort()
self.stars = copy(self.listet)
self.parametres['stars'] = copy(self.listet)
self.parametres['sfromchi'] = False
+ self.dlg.Destroy()
prep = PrepSimi(self.ira, self, self.parametres, self.pathout['selected.csv'], self.actives, indices_simi, wordlist=dictcol)
if prep.val == wx.ID_OK :
continu = True
self.parametres = prep.parametres
+ self.dlg = progressbar(self.ira, 4)
+ else :
+ continu = True
if continu :
self.makefiles()
script = PrintSimiScript(self)
else :
return False
-# def preferences(self) :
-# dial = StatDialog(self, self.parent)
-# dial.CenterOnParent()
-# val = dial.ShowModal()
-# if val == 5100 :
-# if dial.radio_lem.GetSelection() == 0 :
-# lem = 1
-# else :
-# lem = 0
-# self.parametres['lem'] = lem
-# dial.Destroy()
-# return self.parametres
-# else :
-# dial.Destroy()
-# return None
-
def makesimiparam(self) :
self.paramsimi = {'coeff' : 0,
'layout' : 2,
'height' : 1000,
'bystar' : False,
'first' : True,
- 'keep_coord' : True,
+ 'keep_coord' : False,
'alpha' : 20,
'film': False,
'svg' : 0,
self.parametres['type'] = 'clustersimitxt'
self.pathout.basefiles(simipath)
self.indices = indices_simi
- self.makesimiparam()
+ if self.dlg :
+ self.makesimiparam()
if 'bystar' in self.parametres :
del self.parametres['bystar']
dictcol = dict([[i, [act, self.corpus.getlemclustereff(act, self.numcluster)]] for i, act in enumerate(self.actives)])
#self.listet = self.corpus.make_etoiles()
#self.listet.sort()
self.stars = []#copy(self.listet)
- self.parametres['stars'] = False#copy(self.listet)
- self.parametres['sfromchi'] = True
+ self.parametres['stars'] = 0#copy(self.listet)
+ self.parametres['sfromchi'] = 1
prep = PrepSimi(self.ira, self, self.parametres, self.pathout['selected.csv'], self.actives, indices_simi, wordlist=dictcol)
if prep.val == wx.ID_OK :
continu = True
continu = False
if continu :
self.makefiles()
+ self.parametres['type'] = 'clustersimitxt'
script = PrintSimiScript(self)
script.make_script()
if not self.doR(script.scriptout, dlg = self.dlg, message = 'R ...') :