X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=layout.py;h=a7d7b2e340c053a8dfed3c05e532c2bfca8f5a6b;hp=aa098404a0213d1b157e8c55b1a6b9b7b34e5d3d;hb=2560c66bef5e023dbce18c556363ec956bd15e47;hpb=a9b4571e2e23ad165436cb2ccc79d18083882091 diff --git a/layout.py b/layout.py index aa09840..a7d7b2e 100644 --- a/layout.py +++ b/layout.py @@ -8,9 +8,11 @@ import os import wx import wx.lib.hyperlink as hl import wx.lib.agw.aui as aui +import wx.lib.agw.labelbook as LB +from wx.lib.agw.fmresources import * from chemins import ConstructPathOut, ChdTxtPathOut, FFF, ffr, PathOut, StatTxtPathOut, simipath from ConfigParser import ConfigParser -from functions import ReadProfileAsDico, GetTxtProfile, read_list_file, ReadList, exec_rcode, print_liste, BugReport, DoConf, indices_simi, check_Rresult, progressbar +from functions import ReadProfileAsDico, GetTxtProfile, read_list_file, ReadList, exec_rcode, print_liste, BugReport, DoConf, indices_simi, check_Rresult, progressbar, normpath_win32, TGen from ProfList import ProfListctrlPanel from guiparam3d import param3d, simi3d from PrintRScript import write_afc_graph, print_simi3d, PrintSimiScript @@ -162,7 +164,10 @@ class GraphPanelAfc(wx.Panel): else : svg = 1 typegraph = dial.choicetype.GetSelection() - typefile = '.png' + if svg : + typefile = '.svg' + else : + typefile = '.png' if self.clnb <= 3 and typegraph == 1 : typegraph = 2 if typegraph == 2: @@ -201,7 +206,7 @@ class GraphPanelAfc(wx.Panel): self.RscriptsPath = self.ira.RscriptsPath txt = """ load("%s") - """ % self.DictPathOut['RData'] + """ % ffr(self.DictPathOut['RData']) if self.itempath == 'liste_graph_afcf' : txt += """ afc <- afcf @@ -375,6 +380,14 @@ class OpenCHDS(): DictProfile = ReadProfileAsDico(Profile, Alceste, self.encoding) self.DictProfile = DictProfile self.cluster_size = [] + clusternames = {} + for i in range(0, clnb) : + clusternames[i] = ' '.join([u'%i' % (i + 1), _(u'Cluster').decode('utf8'), u'%i' % (i + 1)]) + if os.path.exists(self.pathout['classes_names.txt']) : + with codecs.open(self.pathout['classes_names.txt'], 'r', self.parent.syscoding) as f : + clusternames_ = f.read() + clusternames_ = dict([[i, ' '.join([`i + 1`, line])] for i, line in enumerate(clusternames_.splitlines())]) + clusternames.update(clusternames_) #print 'lecture des antiprofils' #DictAnti = ReadProfileAsDico(self, AntiProfile, Alceste, self.encoding) @@ -414,6 +427,7 @@ class OpenCHDS(): #self.TabChdSim = wx.aui.AuiNotebook(self.parent.nb, -1, wx.DefaultPosition) notebook_flags = aui.AUI_NB_DEFAULT_STYLE | aui.AUI_NB_TAB_EXTERNAL_MOVE | aui.AUI_NB_TAB_MOVE | aui.AUI_NB_TAB_FLOAT| wx.NO_BORDER panel.TabChdSim = aui.AuiNotebook(panel, -1, wx.DefaultPosition) + #panel.TabChdSim = LB.LabelBook(panel, -1, agwStyle = INB_TOP|INB_SHOW_ONLY_TEXT|INB_FIT_LABELTEXT) panel.TabChdSim.SetAGWWindowStyleFlag(notebook_flags) panel.TabChdSim.SetArtProvider(aui.ChromeTabArt()) sizer1.Add(panel.TabChdSim,10, wx.EXPAND, 5) @@ -439,7 +453,12 @@ class OpenCHDS(): panel.TabChdSim.AddPage(CHD,'CHD') panel.ProfNB = aui.AuiNotebook(panel, -1, wx.DefaultPosition) - panel.ProfNB.SetArtProvider(aui.ChromeTabArt()) + notebook_flags |= aui.AUI_NB_WINDOWLIST_BUTTON + panel.ProfNB.SetAGWWindowStyleFlag(notebook_flags) + #panel.ProfNB.SetArtProvider(aui.ChromeTabArt()) + #panel.ProfNB = LB.LabelBook(panel, -1, agwStyle = INB_LEFT|INB_SHOW_ONLY_TEXT|INB_FIT_LABELTEXT) + #panel.ProfNB = wx.Listbook(self.parent, -1, style = wx.BK_DEFAULT) + #panel.ProfNB = wx.Treebook(self.parent, -1, style = wx.BK_DEFAULT) #self.ProfNB.SetTabCtrlHeight(100) #panel.AntiProfNB = aui.AuiNotebook(panel, -1, wx.DefaultPosition) if os.path.exists(DictPathOut['prof_seg']) : @@ -450,15 +469,18 @@ class OpenCHDS(): if isinstance(self.corpus, Corpus) : DictProfile[str(i + 1)][1:] = [val[0:5] + [getlemgram(self.corpus, val)] + val[6:] for val in DictProfile[str(i + 1)][1:]] dlg.Update(3+i, 'Classe %i' %(i+1)) - ind = '/'.join(DictProfile[str(i + 1)][0][0:2]) - indpour = ' - '.join([ind, DictProfile[str(i + 1)][0][2]]) + ind = '/'.join(DictProfile[str(i + 1)][0][0:2]).strip() + indpour = '\n'.join([ind, DictProfile[str(i + 1)][0][2]]) self.tabprofile = ProfListctrlPanel(self.parent, self.panel, DictProfile[str(i + 1)], Alceste, i + 1) #self.tabantiprofile = ProfListctrlPanel(self.parent, self, DictAnti[str(i + 1)], Alceste, i + 1) - panel.ProfNB.AddPage(self.tabprofile, _(u"Cluster").decode('utf8') + ' %s %s(%s%%)' % (str(i + 1), sep, indpour)) + panel.ProfNB.AddPage(self.tabprofile, clusternames[i] + '\n%s%%' % indpour, True) + panel.ProfNB.SetPageTextColour(i, '#890909') + panel.ProfNB.SetRenamable(i, True) #panel.AntiProfNB.AddPage(self.tabantiprofile, 'classe %s' % str(i + 1)) if os.path.exists(DictPathOut['prof_seg']) : self.tab_prof_seg = ProfListctrlPanel(self.parent, self, prof_seg[str(i + 1)], False, i + 1) self.prof_seg_nb.AddPage(self.tab_prof_seg, _(u"Cluster").decode('utf8') + ' %i' % (i + 1)) + panel.ProfNB.SetSelection(0) if clnb > 2 : self.TabAFC = aui.AuiNotebook(panel.TabChdSim, -1, wx.DefaultPosition) @@ -497,6 +519,10 @@ class OpenCHDS(): panel.TabChdSim.AddPage(self.prof_seg_nb, _(u"Repeated segments profiles").decode('utf8')) # panel.Bind(wx.EVT_BUTTON, self.ongetrapport, id = self.ID_rapport) + if os.path.exists(os.path.join(self.parametres['pathout'], 'tgenchi2.csv')) : + self.parametres['tgenspec'] = os.path.join(self.parametres['pathout'], 'tgenchi2.csv') + TgenLayout(panel) + panel.TabChdSim.SetSelection(0) self.parent.nb.AddPage(panel, _(u"Clustering").decode('utf8') + ' - %s' % corpname) self.parent.ShowTab(True) self.parent.nb.SetSelection(self.parent.nb.GetPageCount() - 1) @@ -543,37 +569,34 @@ def PrintRapport(self, corpus, parametres, istxt = True): """ % datetime.datetime.now().ctime() if istxt : totocc = corpus.gettotocc() - txt += u'nombre de textes: %i%s' % (corpus.getucinb(), sep) - txt += u'nombre de segments de textes: %i%s' % (corpus.getucenb(), sep) - txt += u'nombre de formes: %i%s' % (len(corpus.formes), sep) - txt += u'nombre d\'occurrences: %i%s' % (totocc, sep) - txt += u'moyenne d\'occurrences par forme: %f%s' % (float(totocc) / float(len(self.corpus.formes)), sep) - txt += u'nombre de lemmes: %i%s' % (len(corpus.lems), sep) - txt += u'nombre de formes actives: %i%s' % (corpus.getactivesnb(1), sep) - txt += u'nombre de formes supplémentaires: %i%s' % (corpus.getactivesnb(2), sep) - txt += u'nombre de formes actives de fréquence >= %i: %i%s' % (parametres['eff_min_forme'], parametres['nbactives'], sep) - txt += u'moyenne d\'occurrences par segments :%f%s' % (float(totocc) / float(corpus.getucenb()), sep) + txt += ': '.join([_(u'Number of texts').decode('utf8'), u'%i%s' % (corpus.getucinb(), sep)]) + txt += ': '.join([_(u'Number of text segments').decode('utf8'), '%i%s' % (corpus.getucenb(), sep)]) + txt += ': '.join([_(u'Number of forms').decode('utf8'), '%i%s' % (len(corpus.formes), sep)]) + txt += ': '.join([_(u'Number of occurrences').decode('utf8'), '%i%s' % (totocc, sep)]) + #txt += u'moyenne d\'occurrences par forme: %f%s' % (float(totocc) / float(len(self.corpus.formes)), sep) + txt += ': '.join([_(u'Number of lemmas').decode('utf8'), '%i%s' % (len(corpus.lems), sep)]) + txt += ': '.join([_(u'Number of active forms').decode('utf8'), '%i%s' % (corpus.getactivesnb(1), sep)]) + txt += ': '.join([_(u'Number of supplementary forms').decode('utf8'), '%i%s' % (corpus.getactivesnb(2), sep)]) + txt += ' >= '.join([_(u'Number of active forms with a frequency').decode('utf8'), '%i: %i%s' % (parametres['eff_min_forme'], parametres['nbactives'], sep)]) + txt += ': '.join([_(u'Mean of forms by segment').decode('utf8'), '%f%s' % (float(totocc) / float(corpus.getucenb()), sep)]) if 'tailleuc1' in parametres : if parametres['classif_mode'] == 0 : - txt += u'taille rst1 / rst2: %i / %i - %i / %i%s' % (parametres['tailleuc1'], parametres['tailleuc2'], parametres['lenuc1'], parametres['lenuc2'], sep) + txt += ': '.join([_(u'Size of rst1 / rst2').decode('utf8'), '%i / %i - %i / %i%s' % (parametres['tailleuc1'], parametres['tailleuc2'], parametres['lenuc1'], parametres['lenuc2'], sep)]) else : self.Ucenb = self.nbind - txt += u'nombre d\'individus : %i%s' % (self.nbind, sep) - txt += u'nombre de classes : %i%s' % (self.clnb, sep) + txt += ': '.join([_(u'Number of lines').decode('utf8'), '%i%s' % (self.nbind, sep)]) + txt += ': '.join([_(u'Number of clusters').decode('utf8'), '%i%s' % (self.clnb, sep)]) if istxt : - txt += u'nombre de classes : %i%s' % (parametres['clnb'], sep) + txt += ': '.join([_(u'Number of clusters').decode('utf8'), '%i%s' % (parametres['clnb'], sep)]) if parametres['classif_mode'] == 0 or parametres['classif_mode'] == 1 : - txt += u'%i segments classés sur %i (%.2f%%)%s' % (sum([len(cl) for cl in corpus.lc]), corpus.getucenb(), (float(sum([len(cl) for cl in corpus.lc])) / float(corpus.getucenb())) * 100, sep) + txt += ' '.join(['%i' % sum([len(cl) for cl in corpus.lc]), _(u'segments classified on').decode('utf8'), '%i (%.2f%%)%s' % (corpus.getucenb(), (float(sum([len(cl) for cl in corpus.lc])) / float(corpus.getucenb())) * 100, sep)]) elif self.parametres['classif_mode'] == 2 : - txt += u'%i textes classés sur %i (%.2f%%)%s' % (sum([len(cl) for cl in corpus.lc]), corpus.getucinb(), (float(sum([len(cl) for cl in corpus.lc]))) / float(corpus.getucinb()) * 100, sep) + txt += ' '.join([u'%i' % sum([len(cl) for cl in corpus.lc]), _(u'texts classified on').decode('utf8'), '%i (%.2f%%)%s' % (corpus.getucinb(), (float(sum([len(cl) for cl in corpus.lc]))) / float(corpus.getucinb()) * 100, sep)]) else : - txt += u'%i segments classées sur %i (%.2f%%)%s' % (self.ucecla, self.Ucenb, (float(self.ucecla) / float(self.Ucenb)) * 100, sep) + txt += ' '.join(['%i' % self.ucecla, _(u'line classified on').decode('utf8'), '%i (%.2f%%)%s' % (self.Ucenb, (float(self.ucecla) / float(self.Ucenb)) * 100, sep)]) - txt += """ -########################### -temps d'analyse : %s -########################### -""" % parametres.get('time', '') + txt += ''.join([sep, u'###########################', sep, _(u'time').decode('utf8'), ' : %s' % parametres.get('time', ''), sep, u'###########################', sep]) + with open(self.pathout['pre_rapport'], 'w') as f : f.write(txt) @@ -637,22 +660,34 @@ class TgenLayout : self.page = page parametres = self.page.parametres ira = wx.GetApp().GetTopWindow() + tgenpath = os.path.join(parametres['pathout'], 'tgen.csv') self.page.tgens, etoiles = ReadList(parametres['tgenspec'], ira.syscoding, sep="\t") + tgen = TGen(path = tgenpath, encoding = parametres['encoding']) + tgen.read() tgentab = False + gparent = None + if 'TabChdSim' in dir(page) : + page = page.TabChdSim for i in range(page.GetPageCount()) : tab = page.GetPage(i) + if 'gparent' in dir(tab) : + if tab.gparent is not None : + gparent = tab.gparent if 'tgen' in dir(tab) : if tab.tgen : tgentab = tab break + if tgentab : self.page.tgentab.RefreshData(self.page.tgens) - self.page.SetSelection(i) + self.page.tgentab.tgens = tgen.tgen + page.SetSelection(i) else : - self.page.tgentab = ListForSpec(ira, None, self.page.tgens, etoiles[1:]) + self.page.tgentab = ListForSpec(ira, gparent, self.page.tgens, etoiles[1:]) self.page.tgentab.tgen = True - self.page.AddPage(self.page.tgentab, u'Tgens Specificities') - self.page.SetSelection(self.page.GetPageCount() - 1) + self.page.tgentab.tgens = tgen.tgen + page.AddPage(self.page.tgentab, _(u'Tgens Specificities').decode('utf8')) + page.SetSelection(page.GetPageCount() - 1) class dolexlayout : def __init__(self, ira, corpus, parametres): @@ -680,37 +715,33 @@ class dolexlayout : self.TabStat.parametres = parametres self.ListPan = ListForSpec(ira, self, self.DictSpec, self.etoiles) if os.path.exists(self.pathout['banalites.csv']) : - self.listban = ListForSpec(ira, self, self.dictban, ['eff'] + self.etoiles) + self.listban = ListForSpec(ira, self, self.dictban, ['eff'] + self.etoiles, usefirst = True) #self.ListPan2 = ListForSpec(sash.rightwin1, self, self.DictSpec, first) self.ListPant = ListForSpec(ira, self, self.DictType, self.etoiles) self.ListPanEff = ListForSpec(ira, self, self.DictEff, self.etoiles) self.ListPanEffType = ListForSpec(ira, self, self.DictEffType, self.etoiles) self.ListPanEffRelForme = ListForSpec(ira, self, self.DictEffRelForme, self.etoiles) - self.ListPanEffRelType = ListForSpec(ira, self.parent, self.DictEffRelType, self.etoiles) + self.ListPanEffRelType = ListForSpec(ira, self, self.DictEffRelType, self.etoiles) - self.TabStat.AddPage(self.ListPan, u'formes') + self.TabStat.AddPage(self.ListPan, _(u'Forms').decode('utf8')) if os.path.exists(self.pathout['banalites.csv']) : - self.TabStat.AddPage(self.listban, u'banalités') - self.TabStat.AddPage(self.ListPant, u'Types') - self.TabStat.AddPage(self.ListPanEff, u'Effectifs formes') - self.TabStat.AddPage(self.ListPanEffType, u'Effectifs Type') - self.TabStat.AddPage(self.ListPanEffRelForme, u'Effectifs relatifs formes') - self.TabStat.AddPage(self.ListPanEffRelType, u'Effectifs relatifs Type') + self.TabStat.AddPage(self.listban, _(u'Banal forms').decode('utf8')) + self.TabStat.AddPage(self.ListPant, _(u'POS').decode('utf8')) + self.TabStat.AddPage(self.ListPanEff, _(u'Forms frequencies').decode('utf8')) + self.TabStat.AddPage(self.ListPanEffType, _(u'POS frequencies').decode('utf8')) + self.TabStat.AddPage(self.ListPanEffRelForme, _(u'Forms relative frequencies').decode('utf8')) + self.TabStat.AddPage(self.ListPanEffRelType, _(u'POS relative frequencies').decode('utf8')) if self.parametres['clnb'] > 2 : self.TabAFC = aui.AuiNotebook(self.TabStat, -1, wx.DefaultPosition) list_graph=read_list_file(self.dictpathout['liste_graph_afcf'], encoding = self.encoding) self.tabAFCGraph = GraphPanelAfc(self.TabAFC, self.dictpathout, list_graph, self.parametres['clnb'], itempath ='liste_graph_afcf', coding = self.encoding) - self.TabAFC.AddPage(self.tabAFCGraph, 'AFC formes') + self.TabAFC.AddPage(self.tabAFCGraph, _(u'CA forms').decode('utf8')) list_graph=read_list_file(self.dictpathout['liste_graph_afct'], encoding = self.encoding) self.tabAFCTGraph = GraphPanelAfc(self.TabAFC, self.dictpathout, list_graph, self.parametres['clnb'], itempath ='liste_graph_afct', coding=self.encoding) - self.TabAFC.AddPage(self.tabAFCTGraph, 'AFC type') - self.TabStat.AddPage(self.TabAFC, 'AFC') - - - - + self.TabAFC.AddPage(self.tabAFCTGraph, _(u'CA POS').decode('utf8')) + self.TabStat.AddPage(self.TabAFC, _(u'CA').decode('utf8')) - ira.nb.AddPage(self.TabStat, u'Spécificités') + ira.nb.AddPage(self.TabStat, ' - '.join([_(u'Specificities').decode('utf8'), self.parametres['name']])) self.ira = ira self.TabStat.corpus = self.corpus @@ -738,12 +769,19 @@ class StatLayout: #self.TabStatTot = wx.TextCtrl(self.TabStat, -1, style=wx.NO_BORDER | wx.TE_MULTILINE | wx.TE_RICH2) list_graph = [['zipf.png', 'zipf']] self.TabStatTot = GraphPanel(ira.nb, self.pathout, list_graph, self.result['glob']) - self.TabStat.AddPage(self.TabStatTot, 'global') + self.TabStat.AddPage(self.TabStatTot, _(u'Abstract').decode('utf8')) + + dictlabel = {'total' : _(u'Total').decode('utf8'), + u'formes_actives' : _(u'Actives forms').decode('utf8'), + u'formes_supplémentaires': _(u'Supplementary forms').decode('utf8'), + u'hapax' : _(u'Hapax').decode('utf8'), + } + for item in self.result: if item != 'glob': datam = [['forme', 'nb']] self.ListPan = ListPanel(ira, self, self.result[item]) - self.TabStat.AddPage(self.ListPan, ' '.join(item.split('_'))) + self.TabStat.AddPage(self.ListPan, dictlabel[item]) ira.nb.AddPage(self.TabStat, '%s' % parametres['name']) ira.nb.SetSelection(ira.nb.GetPageCount() - 1) ira.ShowAPane("Tab_content") @@ -775,13 +813,19 @@ class GraphPanelDendro(wx.Panel): self.panel_1.SetBackgroundColour('white') self.deb = wx.StaticText(self.panel_1, -1, txt) dendro_img = wx.Image(os.path.join(self.ira.images_path,'but_dendro.png'), wx.BITMAP_TYPE_ANY).ConvertToBitmap() + dendro_liste_img = wx.Image(os.path.join(self.ira.images_path,'but_dendro_liste.png'), wx.BITMAP_TYPE_ANY).ConvertToBitmap() + dendro_cloud_img= wx.Image(os.path.join(self.ira.images_path,'but_dendro_cloud.png'), wx.BITMAP_TYPE_ANY).ConvertToBitmap() self.butdendro = wx.BitmapButton(self, -1, dendro_img) - self.butdendrotexte = wx.BitmapButton(self, -1, dendro_img) - self.butdendrocloud = wx.BitmapButton(self, -1, dendro_img) + self.butdendrotexte = wx.BitmapButton(self, -1, dendro_liste_img) + self.butdendrocloud = wx.BitmapButton(self, -1, dendro_cloud_img) for i in range(0,len(list_graph)): if os.path.exists(os.path.join(self.dirout,list_graph[i][0])) : - self.listimg.append(wx.StaticBitmap(self.panel_1, -1, wx.Bitmap(os.path.join(self.dirout,list_graph[i][0]), wx.BITMAP_TYPE_ANY))) + filename, ext = os.path.splitext(list_graph[i][0]) + if ext == '.svg' : + self.listimg.append(hl.HyperLinkCtrl(self.panel_1, -1, os.path.join(self.dirout,list_graph[i][0]), URL=os.path.join(self.dirout,list_graph[i][0]))) + else : + self.listimg.append(wx.StaticBitmap(self.panel_1, -1, wx.Bitmap(os.path.join(self.dirout,list_graph[i][0]), wx.BITMAP_TYPE_ANY))) self.labels.append(wx.StaticText(self.panel_1, -1, list_graph[i][1])) self.__set_properties() @@ -800,7 +844,8 @@ class GraphPanelDendro(wx.Panel): 'type_dendro': 0, 'color_nb': 0, 'taille_classe' : True, - 'type_tclasse' : 0 + 'type_tclasse' : 0, + 'svg' : 0 } self.type_dendro = [ u"phylogram", u"cladogram", u"fan", u"unrooted", u"radial" ] @@ -828,11 +873,16 @@ class GraphPanelDendro(wx.Panel): self.param['color_nb'] = dial.m_radioBox1.GetSelection() self.param['taille_classe'] = dial.m_checkBox1.GetValue() self.param['type_tclasse'] = dial.m_radioBox2.GetSelection() + self.param['svg'] = dial.choice_format.GetSelection() def make_dendro(self, dendro = 'simple') : - while os.path.exists(os.path.join(self.dirout, 'dendrogramme_' + str(self.graphnb)+'.png')) : + if self.param['svg'] : + typefile = '.svg' + else : + typefile = '.png' + while os.path.exists(os.path.join(self.dirout, 'dendrogramme_' + str(self.graphnb)+typefile)) : self.graphnb += 1 - fileout = ffr(os.path.join(self.dirout,'dendrogramme_' + str(self.graphnb)+'.png')) + fileout = ffr(os.path.join(self.dirout,'dendrogramme_' + str(self.graphnb)+typefile)) width = self.param['width'] height = self.param['height'] type_dendro = self.type_dendro[self.param['type_dendro']] @@ -848,6 +898,10 @@ class GraphPanelDendro(wx.Panel): histo='FALSE' else : histo = 'TRUE' + if self.param['svg'] : + svg = 'TRUE' + else : + svg = 'FALSE' dendro_path = self.dictpathout['Rdendro'] classe_path = self.dictpathout['uce'] txt = """ @@ -866,28 +920,40 @@ class GraphPanelDendro(wx.Panel): txt += """ load("%s") source("%s") + if (is.null(debsup)) { + debsup <- debet + } chistable <- chistabletot[1:(debsup-1),] - open_file_graph("%s", width=%i, height=%i) + open_file_graph("%s", width=%i, height=%i, svg = %s) plot.dendro.prof(tree.cut1$tree.cl, classes, chistable, nbbycl = 60, type.dendro="%s", bw=%s, lab=NULL) - """ % (ffr(self.dictpathout['RData.RData']), ffr(self.ira.RscriptsPath['Rgraph']), ffr(fileout), width, height, type_dendro, bw) + """ % (ffr(self.dictpathout['RData.RData']), ffr(self.ira.RscriptsPath['Rgraph']), ffr(fileout), width, height, svg, type_dendro, bw) elif dendro == 'cloud' : txt += """ load("%s") source("%s") + if (is.null(debsup)) { + debsup <- debet + } chistable <- chistabletot[1:(debsup-1),] - open_file_graph("%s", width=%i, height=%i) + open_file_graph("%s", width=%i, height=%i, svg=%s) plot.dendro.cloud(tree.cut1$tree.cl, classes, chistable, nbbycl = 300, type.dendro="%s", bw=%s, lab=NULL) - """ % (ffr(self.dictpathout['RData.RData']), ffr(self.ira.RscriptsPath['Rgraph']), ffr(fileout), width, height, type_dendro, bw) + """ % (ffr(self.dictpathout['RData.RData']), ffr(self.ira.RscriptsPath['Rgraph']), ffr(fileout), width, height, svg, type_dendro, bw) tmpfile = tempfile.mktemp() with open(tmpfile, 'w') as f : f.write(txt) + busy = wx.BusyInfo(_("Please wait...").decode('utf8'), self.parent) + wx.SafeYield() error = exec_rcode(self.ira.RPath, tmpfile, wait=True) + del busy check_Rresult(self.ira, error) self.list_graph.append([fileout, 'Dendrogramme CHD1 - %s' % type_dendro]) print_liste(self.dictpathout['liste_graph_chd'], self.list_graph) - self.sizer_3.Add(wx.StaticBitmap(self.panel_1, -1, wx.Bitmap(fileout, wx.BITMAP_TYPE_ANY)), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) + if self.param['svg'] : + self.sizer_3.Add(hl.HyperLinkCtrl(self.panel_1, -1, fileout, URL=fileout), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) + else : + self.sizer_3.Add(wx.StaticBitmap(self.panel_1, -1, wx.Bitmap(fileout, wx.BITMAP_TYPE_ANY)), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) self.sizer_3.Add(wx.StaticText(self.panel_1,-1, 'Dendrogramme CHD1 - %s' % type_dendro), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) self.sizer_3.Fit(self.panel_1) self.Layout() @@ -931,17 +997,8 @@ class MatLayout : ira.nb.AddPage(self.sheet, matrix.parametres['matrix_name']) self.sheet.Populate(matrix.csvtable) self.sheet.parametres = matrix.parametres - #self.ira.ShowMenu(_(u"View").decode('utf8')) - #self.ira.ShowMenu(_(u"Matrix analysis").decode('utf8')) - #self.ira.ShowMenu(_(u"Text analysis").decode('utf8'), False) - #self.parent.type = "Data" - #self.parent.DataPop = False ira.nb.SetSelection(ira.nb.GetPageCount() - 1) ira.ShowAPane("Tab_content") - #self.ira.OnViewData('') - - - class CopusPanel(wx.Panel) : def __init__(self, parent, parametres) : @@ -952,7 +1009,7 @@ class CopusPanel(wx.Panel) : fgSizer5.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_SPECIFIED ) self.fgSizer5 = fgSizer5 - self.m_staticText18 = wx.StaticText( self, wx.ID_ANY, u"Description du corpus", wx.DefaultPosition, wx.DefaultSize, 0 ) + self.m_staticText18 = wx.StaticText( self, wx.ID_ANY, _(u"Description of corpus").decode('utf8'), wx.DefaultPosition, wx.DefaultSize, 0 ) self.m_staticText18.Wrap( -1 ) fgSizer5.Add( self.m_staticText18, 0, wx.ALL, 5 ) @@ -969,12 +1026,12 @@ class CopusPanel(wx.Panel) : self.m_staticText21.Wrap( -1 ) fgSizer5.Add( self.m_staticText21, 0, wx.ALL, 5 ) - description = {'lang' : u'langue', - 'encoding' : u'encodage', - 'ucinb' : u'Nombre de textes', - 'ucenb' : u'Nombre de segments de texte', - 'formesnb' : u'Nombre de formes', - 'hapax' : u'Nombre d\'hapax' + description = {'lang' : _(u'Language').decode('utf8'), + 'encoding' : _(u'Characters set').decode('utf8'), + 'ucinb' : _(u'Number of texts').decode('utf8'), + 'ucenb' : _(u'Number of text segments').decode('utf8'), + 'formesnb' : _(u'Number of forms').decode('utf8'), + 'hapax' : _(u'Number of hapax').decode('utf8'), } keys = ['lang', 'encoding', 'originalpath', 'pathout', 'date', 'time'] @@ -1066,7 +1123,7 @@ class SimiLayout(DefaultTextLayout) : self.graphpan.Bind(wx.EVT_BUTTON, self.redosimi, self.graphpan.butafc) self.graphpan.Bind(wx.EVT_BUTTON, self.export, self.graphpan.butexport) self.tabsimi.AddPage(self.graphpan, 'Graph') - self.ira.nb.AddPage(self.tabsimi, 'Analyse de graph') + self.ira.nb.AddPage(self.tabsimi, _(u'Graph analysis').decode('utf8')) self.ira.ShowTab(True) self.ira.nb.SetSelection(self.ira.nb.GetPageCount() - 1) @@ -1158,7 +1215,7 @@ class SimiLayout(DefaultTextLayout) : with open(filetmp, 'w') as f : f.write(txt) exec_rcode(self.ira.RPath, filetmp) - mss = wx.MessageDialog(self.ira, fileout, u'Fichier exporté', wx.OK) + mss = wx.MessageDialog(self.ira, fileout, _(u'File exported').decode('utf8'), wx.OK) mss.CenterOnParent() mss.ShowModal() mss.Destroy() @@ -1182,11 +1239,10 @@ class DefaultMatLayout : class FreqLayout(DefaultMatLayout) : def dolayout(self) : self.tab = wx.html.HtmlWindow(self.ira.nb, -1) - if "gtk2" in wx.PlatformInfo: - self.tab.SetStandardFonts() - self.tab.LoadPage(self.pathout['resultats.html']) + res = normpath_win32(self.pathout['resultats.html']).replace('\\','/') + self.tab.LoadPage(res) self.tab.parametres = self.parametres - self.ira.nb.AddPage(self.tab, u"Fréquences") + self.ira.nb.AddPage(self.tab, ' - '.join([_(u"Frequency").decode('utf8'), self.parametres['name']])) class Chi2Layout(DefaultMatLayout) : @@ -1194,16 +1250,17 @@ class Chi2Layout(DefaultMatLayout) : self.tab = wx.html.HtmlWindow(self.ira.nb, -1) if "gtk2" in wx.PlatformInfo: self.tab.SetStandardFonts() - self.tab.LoadPage(self.pathout['resultats-chi2.html']) + res = normpath_win32(self.pathout['resultats-chi2.html']).replace('\\','/') + self.tab.LoadPage(res) self.tab.parametres = self.parametres - self.ira.nb.AddPage(self.tab, ' - '.join([u"Chi2", "%s" % self.parametres['name']])) + self.ira.nb.AddPage(self.tab, ' - '.join([u"Chi2", self.parametres['name']])) #self.ira.nb.SetSelection(self.ira.nb.GetPageCount() - 1) #self.ira.ShowAPane("Tab_content") class ProtoLayout(DefaultMatLayout) : def dolayout(self) : - list_graph = [['proto.png', 'Analyse prototypique']] + list_graph = [['proto.png', _(u'Prototypical analysis').decode('utf8')]] #self.Tab = aui.AuiNotebook(self.ira.nb, -1, wx.DefaultPosition) #if self.parametres['svg'] : # list_graph = [['nuage_1.svg', 'Nuage']] @@ -1213,7 +1270,7 @@ class ProtoLayout(DefaultMatLayout) : #self.Tab.AddPage(self.TabProto, 'Analyse Prototypique') #self.Tab.corpus = self.corpus self.TabProto.parametres = self.parametres - self.ira.nb.AddPage(self.TabProto, 'Analyse Prototypique - %s' % self.parametres['name']) + self.ira.nb.AddPage(self.TabProto, ' - '.join([_(u'Prototypical analysis').decode('utf8'), self.parametres['name']])) #self.ira.nb.SetSelection(self.ira.nb.GetPageCount() - 1) #self.ira.ShowAPane("Tab_content") @@ -1235,7 +1292,7 @@ class SimiMatLayout(DefaultMatLayout) : self.graphpan.Bind(wx.EVT_BUTTON, self.export, self.graphpan.butexport) self.tabsimi.AddPage(self.graphpan, 'Graph') self.tabsimi.parametres = self.parametres - self.parent.nb.AddPage(self.tabsimi, 'Analyse de graph') + self.parent.nb.AddPage(self.tabsimi, ' - '.join([_(u'Graph analysis').decode('utf8'), self.parametres['name']])) #self.parent.ShowTab(True) #self.parent.nb.SetSelection(self.parent.nb.GetPageCount() - 1) @@ -1284,6 +1341,7 @@ class SimiMatLayout(DefaultMatLayout) : fileout = filename + '.svg' else : fileout = self.script.filename + fileout = normpath_win32(fileout) if os.path.exists(self.pathout['liste_graph']): graph_simi = read_list_file(self.pathout['liste_graph']) graph_simi.append([os.path.basename(fileout), self.script.txtgraph]) @@ -1295,7 +1353,7 @@ class SimiMatLayout(DefaultMatLayout) : if self.parametres['svg'] : self.graphpan.sizer_3.Add(hl.HyperLinkCtrl(self.graphpan.panel_1, -1, fileout, URL = fileout), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) else : - self.graphpan.sizer_3.Add(wx.StaticBitmap(self.graphpan.panel_1, -1, wx.Bitmap(self.script.filename, wx.BITMAP_TYPE_ANY)), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) + self.graphpan.sizer_3.Add(wx.StaticBitmap(self.graphpan.panel_1, -1, wx.Bitmap(fileout, wx.BITMAP_TYPE_ANY)), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) self.graphpan.sizer_3.Add(wx.StaticText(self.graphpan.panel_1,-1, self.script.txtgraph), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) self.graphpan.sizer_3.Fit(self.graphpan.panel_1) self.graphpan.Layout() @@ -1343,6 +1401,7 @@ class SimiMatLayout(DefaultMatLayout) : 'halo' : self.dial.halo.GetValue(), 'com' : self.dial.comcheck.GetValue(), 'communities' : self.dial.choix_com.GetSelection(), + 'edgecurved' : self.dial.check_curved.GetValue(), } if 'cexfromchi' in self.parametres : paramsimi['cexfromchi'] = self.dial.checkit.GetValue() @@ -1399,7 +1458,7 @@ class SimiMatLayout(DefaultMatLayout) : with open(filetmp, 'w') as f : f.write(txt) exec_rcode(self.ira.RPath, filetmp) - mss = wx.MessageDialog(self.ira, fileout, u'Fichier exporté', wx.OK) + mss = wx.MessageDialog(self.ira, fileout, _(u'File exported').decode('utf8'), wx.OK) mss.CenterOnParent() mss.ShowModal() mss.Destroy()