X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=layout.py;h=aed4de2ddf7acd8f6468c644b1a5958e3f3b325a;hp=02116683a3f122dbe5f206659d2cf23117475de4;hb=9bde3d55d2131f1a33234a43c0de8b200ddb8f9a;hpb=ab23968410d4e2eff482fd16a639801b457d5063 diff --git a/layout.py b/layout.py index 0211668..aed4de2 100644 --- a/layout.py +++ b/layout.py @@ -10,11 +10,11 @@ import wx import agw.aui as aui 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 -from ProfList import * +from functions import ReadProfileAsDico, GetTxtProfile, read_list_file, ReadList, exec_rcode, print_liste, BugReport, DoConf, indices_simi, check_Rresult, progressbar +from ProfList import ProfListctrlPanel from guiparam3d import param3d, simi3d from PrintRScript import write_afc_graph, print_simi3d, PrintSimiScript -from profile_segment import * +from profile_segment import ProfileSegment from functions import ReadList from listlex import * from Liste import * @@ -26,7 +26,7 @@ import datetime import sys import tempfile import shutil -import webbrowser +#import webbrowser import codecs import logging @@ -45,6 +45,8 @@ class GraphPanelAfc(wx.Panel): self.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "courier")) self.labels = [] self.listimg = [] + self.buts = [] + self.list_graph = list_graph self.TabCHD = self.parent.GetParent() self.nb = self.TabCHD.GetParent() self.ira = self.nb.GetParent() @@ -53,10 +55,17 @@ class GraphPanelAfc(wx.Panel): self.butafc = wx.BitmapButton(self, -1, afc_img) self.Bind(wx.EVT_BUTTON, self.afc_graph, self.butafc) self.dirout = os.path.dirname(self.Dict['ira']) + b = 0 + todel = [] 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))) self.labels.append(wx.StaticText(self.panel_1, -1, list_graph[i][1])) + self.buts.append(wx.Button(self.panel_1, wx.ID_DELETE, name = `i - b`)) + else : + todel.append(i) + b += 1 + self.list_graph = [graph for i, graph in enumerate(self.list_graph) if i not in todel] self.param = { 'typegraph' : 0, 'width' : 800, @@ -65,8 +74,10 @@ class GraphPanelAfc(wx.Panel): 'qui' : 0, 'do_select_nb' : 0, 'do_select_chi' : 0, + 'do_select_chi_classe' : 0, 'select_nb' : 50, 'select_chi' : 4, + 'nbchic' : 30, 'over' : 0, 'cex_txt' : 0, 'txt_min' : 5, @@ -78,6 +89,7 @@ class GraphPanelAfc(wx.Panel): 'facteur' : [1,2,3], 'alpha' : 10, 'clnb' : clnb, + 'svg' : 0, } self.__set_properties() @@ -89,6 +101,7 @@ class GraphPanelAfc(wx.Panel): self.panel_1.SetScrollRate(20, 20) def __do_layout(self): + log.info('do layout') self.sizer_1 = wx.BoxSizer(wx.VERTICAL) self.sizer_2 = wx.BoxSizer(wx.HORIZONTAL) self.sizer_3 = wx.BoxSizer(wx.VERTICAL) @@ -96,10 +109,44 @@ class GraphPanelAfc(wx.Panel): for i in range(0, len(self.listimg)): self.sizer_3.Add(self.listimg[i], 0, wx.ALIGN_CENTER_HORIZONTAL, 0) self.sizer_3.Add(self.labels[i], 0, wx.ALIGN_CENTER_HORIZONTAL, 0) + self.sizer_3.Add(self.buts[i], 0, wx.ALIGN_CENTER_HORIZONTAL, 0) + self.Bind(wx.EVT_BUTTON, self.on_delete_image, self.buts[i]) self.panel_1.SetSizer(self.sizer_3) self.sizer_2.Add(self.panel_1, 1, wx.EXPAND, 0) self.SetSizer(self.sizer_2) + def on_delete_image(self, event) : + image_id = int(event.GetEventObject().GetName()) + image_path = self.list_graph[image_id][0] + message = 'This file will be delete : %s.\nAre you sure ?' % os.path.join(self.dirout, image_path) + dial = wx.MessageDialog(self, message, style = wx.YES_NO) + res = dial.ShowModal() + if res == wx.ID_YES : + dial.Destroy() + log.info('delete image %i' % image_id) + oldimg = self.listimg.pop(image_id) + oldimg.Destroy() + oldlab = self.labels.pop(image_id) + oldlab.Destroy() + oldbut = self.buts.pop(image_id) + oldbut.Show(False) + #No = [but.Destroy() for but in self.buts] + #self.buts = [wx.Button(self.panel_1, wx.ID_DELETE, name = `i`) for i, img in enumerate(self.listimg)] + for i, but in enumerate(self.buts) : + but.SetName(`i`) + todel = self.list_graph.pop(image_id) + os.remove(os.path.join(self.dirout, todel[0])) + print_liste(self.Dict[self.itempath], self.list_graph) + #self.sizer_1.Destroy() + #self.sizer_2.Destroy() + #self.sizer_3.Destroy() + #self.__do_layout() + self.sizer_3.Fit(self.panel_1) + self.Layout() + else : + dial.Destroy() + + def afc_graph(self,event): #dirout = os.path.dirname(self.Dict['ira']) while os.path.exists(os.path.join(self.dirout,'graph_afc_'+str(self.afcnb)+'.png')): @@ -109,6 +156,10 @@ class GraphPanelAfc(wx.Panel): dial.CenterOnParent() val = dial.ShowModal() if val == wx.ID_OK : + if dial.choix_format.GetSelection() == 0 : + svg = 0 + else : + svg = 1 self.param = {'typegraph' : dial.choicetype.GetSelection(), 'width' : dial.spin1.GetValue(), 'height' : dial.spin2.GetValue(), @@ -116,8 +167,10 @@ class GraphPanelAfc(wx.Panel): 'qui' : dial.choice2.GetSelection(), 'do_select_nb' : dial.check1.GetValue(), 'do_select_chi' : dial.check2.GetValue(), + 'do_select_chi_classe' : dial.check_chic.GetValue(), 'select_nb' : dial.spin_nb.GetValue(), 'select_chi' : dial.spin_chi.GetValue(), + 'nbchic' : dial.spin_nbchic.GetValue(), 'over' : dial.check3.GetValue(), 'cex_txt' : dial.check4.GetValue(), 'txt_min' : dial.spin_min.GetValue(), @@ -129,7 +182,8 @@ class GraphPanelAfc(wx.Panel): 'facteur' : [dial.spin_f1.GetValue(),dial.spin_f2.GetValue(), dial.spin_f3.GetValue()], 'clnb' : self.clnb, 'film' : str(dial.film.GetValue()).upper(), - 'alpha' : dial.slider_sphere.GetValue() + 'alpha' : dial.slider_sphere.GetValue(), + 'svg' : svg } self.nb.parent = self.ira self.DictPathOut = self.Dict @@ -171,11 +225,15 @@ class GraphPanelAfc(wx.Panel): if self.param['over'] : txt += u' - Eviter les recouvrements' if self.param['cex_txt'] : txt += u' - taille du texte proportionnel à la masse' if self.param['tchi'] : txt += u' - taille du texte proportionnel au chi2 d\'association' - list_graph = read_list_file(self.DictPathOut[self.itempath], self.coding) - list_graph.append([self.fileout, txt]) - print_liste(self.DictPathOut[self.itempath], list_graph) - self.sizer_3.Add(wx.StaticBitmap(self.panel_1, -1, wx.Bitmap(self.fileout, wx.BITMAP_TYPE_ANY)), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) - self.sizer_3.Add(wx.StaticText(self.panel_1,-1, txt), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) + #list_graph = read_list_file(self.DictPathOut[self.itempath], self.coding) + self.list_graph.append([self.fileout, txt]) + print_liste(self.DictPathOut[self.itempath], self.list_graph) + self.listimg.append(wx.StaticBitmap(self.panel_1, -1, wx.Bitmap(self.fileout, wx.BITMAP_TYPE_ANY))) + self.sizer_3.Add( self.listimg[-1], 0, wx.ALIGN_CENTER_HORIZONTAL, 0) + self.labels.append(wx.StaticText(self.panel_1,-1, txt)) + self.sizer_3.Add(self.labels[-1], 0, wx.ALIGN_CENTER_HORIZONTAL, 0) + self.buts.append(wx.Button(self.panel_1, wx.ID_DELETE, name = `len(self.list_graph) - 1`)) + self.sizer_3.Add(self.buts[-1], 0, wx.ALIGN_CENTER_HORIZONTAL, 0) self.sizer_3.Fit(self.panel_1) self.Layout() @@ -215,7 +273,18 @@ class GraphPanel(wx.ScrolledWindow): self.sizer_2.Add(self.sizer_1, 1, wx.EXPAND, 0) self.SetSizer(self.sizer_1) self.sizer_1.Fit(self) - + + +def open_antiprofil(panel, AntiProfile, encoding) : + DictAnti = ReadProfileAsDico(AntiProfile, True, encoding) + panel.AntiProfNB = aui.AuiNotebook(panel, -1, wx.DefaultPosition) + for i in range(0, panel.parametres['clnb']): + tabantiprofile = ProfListctrlPanel(panel, panel, DictAnti[str(i + 1)], True, i + 1) + panel.AntiProfNB.AddPage(tabantiprofile, 'classe %s' % str(i + 1)) + panel.TabChdSim.AddPage(panel.AntiProfNB, 'Antiprofils') + + + class OpenCHDS(): def __init__(self, parent, corpus, parametres, Alceste=False): #sep = u'\n ' @@ -238,18 +307,6 @@ class OpenCHDS(): elif 'tableau' in dir(gparent) : self.encoding = gparent.tableau.parametres['syscoding'] - #AnalyseConf = ConfigParser() - #AnalyseConf.readfp(codecs.open(filename,'r', self.encoding)) - #AnalyseConf.read(filename) - #if 'analyse' in AnalyseConf.sections() : - # section = 'analyse' - #elif 'questionnaire' in AnalyseConf.sections() : - # section = 'questionnaire' - #elif 'chd_dist_quest' in AnalyseConf.sections() : - # section = 'chd_dist_quest' - #self.section = section - #clnb = AnalyseConf.get(section, 'clusternb') - #clnb = int(clnb) clnb = parametres['clnb'] dlg = progressbar(self, maxi = 4 + clnb) self.clnb = clnb @@ -257,55 +314,41 @@ class OpenCHDS(): print 'lecture des profils' dlg.Update(2, u'lecture des profils') - DictProfile = ReadProfileAsDico(self, Profile, Alceste, self.encoding) + DictProfile = ReadProfileAsDico(Profile, Alceste, self.encoding) self.DictProfile = DictProfile - print 'lecture des antiprofils' - DictAnti = ReadProfileAsDico(self, AntiProfile, Alceste, self.encoding) + self.cluster_size = [] + #print 'lecture des antiprofils' + #DictAnti = ReadProfileAsDico(self, AntiProfile, Alceste, self.encoding) panel = wx.Panel(parent, -1) sizer1 = wx.BoxSizer(wx.VERTICAL) - panel.chd_toolbar = wx.ToolBar(panel, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT | wx.TB_NODIVIDER) - panel.chd_toolbar.SetToolBitmapSize(wx.Size(16, 16)) + if os.path.exists(DictPathOut['pre_rapport']): + with codecs.open(DictPathOut['pre_rapport'], 'r', self.encoding) as f : + txt = f.read() + self.debtext = txt + else : + self.debtext = '' +# panel.chd_toolbar = wx.ToolBar(panel, -1, wx.DefaultPosition, wx.DefaultSize, wx.TB_FLAT | wx.TB_NODIVIDER) +# panel.chd_toolbar.SetToolBitmapSize(wx.Size(16, 16)) if isinstance(self.corpus, Corpus) : panel.corpus = self.corpus - self.ID_sg = wx.NewId() - butsg = wx.Button(panel.chd_toolbar, self.ID_sg, u"Profils des segments répétés ") - panel.chd_toolbar.AddControl(butsg) - panel.chd_toolbar.AddSeparator() - self.ID_export = wx.NewId() - butexp = wx.Button(panel.chd_toolbar, self.ID_export, u"Exporter le corpus ") - panel.chd_toolbar.AddControl(butexp) - panel.chd_toolbar.AddSeparator() - self.ID_colored = wx.NewId() - butcol = wx.Button(panel.chd_toolbar, self.ID_colored, u"Corpus en couleur ") - panel.chd_toolbar.AddControl(butcol) - panel.chd_toolbar.AddSeparator() - self.ID_searchf = wx.NewId() - butsearchf = wx.Button(panel.chd_toolbar, self.ID_searchf, u"Outil de navigation ") - panel.chd_toolbar.AddControl(butsearchf) - panel.chd_toolbar.AddSeparator() - - self.ID_proftype =wx.NewId() - butpt = wx.Button(panel.chd_toolbar, self.ID_proftype, u"Profils des types ") - panel.chd_toolbar.AddControl(butpt) - panel.chd_toolbar.AddSeparator() - - self.ID_clusterstat =wx.NewId() - butclusterstat = wx.Button(panel.chd_toolbar, self.ID_clusterstat, u"Stat par classe ") - panel.chd_toolbar.AddControl(butclusterstat) - panel.chd_toolbar.AddSeparator() - - - self.ID_rapport = wx.NewId() - #rap_img = wx.Image(os.path.join(self.parent.images_path,'icone_rap_16.png'), wx.BITMAP_TYPE_ANY).ConvertToBitmap() - #panel.chd_toolbar.AddLabelTool(self.ID_rapport, "rapport", rap_img, shortHelp=u"Produire le rapport", longHelp=u"Exporter un rapport en texte simple") - butrap = wx.Button(panel.chd_toolbar, self.ID_rapport, u"Rapport ") - panel.chd_toolbar.AddControl(butrap) - - panel.chd_toolbar.Realize() - sizer1.Add(panel.chd_toolbar,0, wx.EXPAND, 5) + panel.dictpathout = self.DictPathOut + panel.pathout = self.DictPathOut + panel.parent = self.parent + panel.DictProfile = self.DictProfile + panel.cluster_size = self.cluster_size + panel.debtext = self.debtext + +# self.ID_rapport = wx.NewId() +# #rap_img = wx.Image(os.path.join(self.parent.images_path,'icone_rap_16.png'), wx.BITMAP_TYPE_ANY).ConvertToBitmap() +# #panel.chd_toolbar.AddLabelTool(self.ID_rapport, "rapport", rap_img, shortHelp=u"Produire le rapport", longHelp=u"Exporter un rapport en texte simple") +# butrap = wx.Button(panel.chd_toolbar, self.ID_rapport, u"Rapport ") +# panel.chd_toolbar.AddControl(butrap) +# +# panel.chd_toolbar.Realize() +# sizer1.Add(panel.chd_toolbar,0, wx.EXPAND, 5) #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 @@ -321,18 +364,10 @@ class OpenCHDS(): panel.TabChdSim.corpus = corpus panel.TabChdSim.corpus.dictpathout = self.DictPathOut panel.parametres = self.parametres + self.panel = panel self.notenb = self.parent.nb.GetPageCount() - if os.path.exists(DictPathOut['pre_rapport']): - #self.tabRap = wx.TextCtrl(self.TabChdSim, -1, "", style=wx.TE_MULTILINE | wx.TE_RICH2) - #self.tabRap.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "courier")) - with codecs.open(DictPathOut['pre_rapport'], 'r', self.encoding) as f : - txt = f.read() - #self.tabRap.write(txt) - #self.tabRap.ShowPosition(0) - self.debtext = txt - else : - self.debtext = '' + if os.path.exists(self.DictPathOut['liste_graph_chd']) : list_graph = read_list_file(self.DictPathOut['liste_graph_chd'], self.encoding) @@ -344,14 +379,14 @@ class OpenCHDS(): #self.ProfNB.SetTabCtrlHeight(100) #panel.AntiProfNB = aui.AuiNotebook(panel, -1, wx.DefaultPosition) if os.path.exists(DictPathOut['prof_seg']) : - prof_seg = ReadProfileAsDico(self, DictPathOut['prof_seg'], False, self.encoding) + prof_seg = ReadProfileAsDico(DictPathOut['prof_seg'], False, self.encoding) self.prof_seg_nb = aui.AuiNotebook(panel, -1, wx.DefaultPosition) for i in range(0, clnb): + self.cluster_size.append(DictProfile[str(i + 1)][0][0:3]) 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]]) - print 'construction liste classe %i' % i - self.tabprofile = ProfListctrlPanel(self.parent, self, DictProfile[str(i + 1)], Alceste, i + 1) + 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, 'classe %s %s(%s%%)' % (str(i + 1), sep, indpour)) #panel.AntiProfNB.AddPage(self.tabantiprofile, 'classe %s' % str(i + 1)) @@ -361,7 +396,7 @@ class OpenCHDS(): if clnb > 2 : self.TabAFC = aui.AuiNotebook(panel.TabChdSim, -1, wx.DefaultPosition) - + log.info('read AFC') list_graph=read_list_file(DictPathOut['liste_graph_afc'], self.encoding) self.tabAFCGraph = GraphPanelAfc(self.TabAFC, DictPathOut, list_graph, self.clnb, coding=self.encoding) self.TabAFC.AddPage(self.tabAFCGraph, 'AFC') @@ -395,15 +430,7 @@ class OpenCHDS(): if os.path.exists(DictPathOut['prof_seg']) : panel.TabChdSim.AddPage(self.prof_seg_nb, u'Profils des segments répétés') - if isinstance(self.corpus, Corpus) : - panel.Bind(wx.EVT_BUTTON, self.on_export_classes, id = self.ID_export) - panel.Bind(wx.EVT_BUTTON, self.onprofseg, id = self.ID_sg) - panel.Bind(wx.EVT_BUTTON, self.oncolored, id = self.ID_colored) - panel.Bind(wx.EVT_BUTTON, self.onsearchf, id = self.ID_searchf) - panel.Bind(wx.EVT_BUTTON, self.onproftype, id = self.ID_proftype) - panel.Bind(wx.EVT_BUTTON, self.onclusterstat, id = self.ID_clusterstat) - - panel.Bind(wx.EVT_BUTTON, self.ongetrapport, id = self.ID_rapport) +# panel.Bind(wx.EVT_BUTTON, self.ongetrapport, id = self.ID_rapport) self.parent.nb.AddPage(panel, 'Classification - %s' % corpname) self.parent.ShowTab(True) self.parent.nb.SetSelection(self.parent.nb.GetPageCount() - 1) @@ -419,76 +446,76 @@ class OpenCHDS(): outfile = print_simi3d(self) error = exec_rcode(self.parent.RPath, outfile, wait = True) - def ongetrapport(self, event) : - dial = PrefSimpleFile(self, self.parent, **{'mask' : '*.txt', 'title': 'Rapport'}) - dial.fbb.SetValue(self.DictPathOut['rapport']) - dial.CenterOnParent() - res = dial.ShowModal() - if res == wx.ID_OK : - fileout = dial.fbb.GetValue() - dial.Destroy() - with open(fileout, 'w') as f : - f.write(self.debtext + '\n' + GetTxtProfile(self.DictProfile)) - msg = u"Fini !" - dlg = wx.MessageDialog(self.parent, msg, u"Rapport", wx.OK | wx.NO_DEFAULT | wx.ICON_INFORMATION) - dlg.CenterOnParent() - dlg.ShowModal() - dlg.Destroy() - else : - dial.Destroy() - - def on_export_classes(self, event) : - corpus = self.parent.nb.GetPage(self.parent.nb.GetSelection()).corpus - dial = PrefExport(self, self.parent) - dial.fbb.SetValue(os.path.join(os.path.dirname(corpus.dictpathout['ira']), 'export_corpus.txt')) - dial.CenterOnParent() - res = dial.ShowModal() - if res == wx.ID_OK : - if dial.radio_type.GetSelection() == 0 : alc = True - else : alc = False - if dial.radio_lem.GetSelection() == 0 : lem = True - else : lem = False - self.corpus.export_corpus_classes(dial.fbb.GetValue(), alc = alc, lem = lem) - msg = u"Fini !" - dial.Destroy() - dlg = wx.MessageDialog(self.parent, msg, u"Export", wx.OK | wx.NO_DEFAULT | wx.ICON_INFORMATION) - dlg.CenterOnParent() - dlg.ShowModal() - dlg.Destroy() - - def onprofseg(self, event): - #try : - print 'plus de bug profseg' - print self.parametres - corpus = self.parent.nb.GetPage(self.parent.nb.GetSelection()).corpus - ProfileSegment(self.parent, self.dictpathout, self.parametres, corpus) - #except : - # BugReport(self.parent) - - def onproftype(self, event): - try : - corpus = self.parent.nb.GetPage(self.parent.nb.GetSelection()).corpus - ProfilType(self.parent, corpus) - except : - BugReport(self.parent) - - def oncolored(self,evt) : - dial = PrefSimpleFile(self, self.parent, **{'mask' : '*.html', 'title': 'Corpus en couleur'}) - dial.fbb.SetValue(os.path.join(os.path.dirname(self.corpus.dictpathout['ira']), 'corpus_couleur.html')) - dial.CenterOnParent() - res = dial.ShowModal() - if res == wx.ID_OK : - fileout = dial.fbb.GetValue() - dial.Destroy() - txt = self.corpus.make_colored_corpus() - with open(fileout, 'w') as f : - f.write(txt) - msg = u"Fini !\nVoulez-vous ouvrir le corpus dans votre navigateur ?" - dlg = wx.MessageDialog(self.parent, msg, u"Corpus en couleur", wx.NO | wx.YES | wx.NO_DEFAULT | wx.ICON_QUESTION) - dlg.CenterOnParent() - if dlg.ShowModal() == wx.ID_YES : - webbrowser.open(fileout) - dlg.Destroy() +# def ongetrapport(self, event) : +# dial = PrefSimpleFile(self, self.parent, **{'mask' : '*.txt', 'title': 'Rapport'}) +# dial.fbb.SetValue(self.DictPathOut['rapport']) +# dial.CenterOnParent() +# res = dial.ShowModal() +# if res == wx.ID_OK : +# fileout = dial.fbb.GetValue() +# dial.Destroy() +# with open(fileout, 'w') as f : +# f.write(self.debtext + '\n' + GetTxtProfile(self.DictProfile, self.cluster_size)) +# msg = u"Fini !" +# dlg = wx.MessageDialog(self.parent, msg, u"Rapport", wx.OK | wx.NO_DEFAULT | wx.ICON_INFORMATION) +# dlg.CenterOnParent() +# dlg.ShowModal() +# dlg.Destroy() +# else : +# dial.Destroy() + +# def on_export_classes(self, event) : +# corpus = self.parent.nb.GetPage(self.parent.nb.GetSelection()).corpus +# dial = PrefExport(self, self.parent) +# dial.fbb.SetValue(os.path.join(os.path.dirname(corpus.dictpathout['ira']), 'export_corpus.txt')) +# dial.CenterOnParent() +# res = dial.ShowModal() +# if res == wx.ID_OK : +# if dial.radio_type.GetSelection() == 0 : alc = True +# else : alc = False +# if dial.radio_lem.GetSelection() == 0 : lem = True +# else : lem = False +# self.corpus.export_corpus_classes(dial.fbb.GetValue(), alc = alc, lem = lem) +# msg = u"Fini !" +# dial.Destroy() +# dlg = wx.MessageDialog(self.parent, msg, u"Export", wx.OK | wx.NO_DEFAULT | wx.ICON_INFORMATION) +# dlg.CenterOnParent() +# dlg.ShowModal() +# dlg.Destroy() + +# def onprofseg(self, event): +# #try : +# print 'plus de bug profseg' +# print self.parametres +# corpus = self.parent.nb.GetPage(self.parent.nb.GetSelection()).corpus +# ProfileSegment(self.parent, self.dictpathout, self.parametres, corpus) +# #except : +# # BugReport(self.parent) +# +# def onproftype(self, event): +# try : +# corpus = self.parent.nb.GetPage(self.parent.nb.GetSelection()).corpus +# ProfilType(self.parent, corpus) +# except : +# BugReport(self.parent) +# +# def oncolored(self,evt) : +# dial = PrefSimpleFile(self, self.parent, **{'mask' : '*.html', 'title': 'Corpus en couleur'}) +# dial.fbb.SetValue(os.path.join(os.path.dirname(self.corpus.dictpathout['ira']), 'corpus_couleur.html')) +# dial.CenterOnParent() +# res = dial.ShowModal() +# if res == wx.ID_OK : +# fileout = dial.fbb.GetValue() +# dial.Destroy() +# txt = self.corpus.make_colored_corpus() +# with open(fileout, 'w') as f : +# f.write(txt) +# msg = u"Fini !\nVoulez-vous ouvrir le corpus dans votre navigateur ?" +# dlg = wx.MessageDialog(self.parent, msg, u"Corpus en couleur", wx.NO | wx.YES | wx.NO_DEFAULT | wx.ICON_QUESTION) +# dlg.CenterOnParent() +# if dlg.ShowModal() == wx.ID_YES : +# webbrowser.open(fileout) +# dlg.Destroy() def onclusterstat(self, evt) : dial = PrefSimpleFile(self, self.parent, **{'mask' : '*.csv', 'title': 'Stat par classe'}) @@ -506,10 +533,10 @@ class OpenCHDS(): if dlg.ShowModal() == wx.ID_OK : dlg.Destroy() - def onsearchf(self, evt) : - if 'FrameSearch' not in dir(self.parent) : - self.parent.FrameSearch = SearchFrame(self.parent, -1, u"Rechercher...", self.corpus) - self.parent.FrameSearch.Show() + #def onsearchf(self, evt) : + # if 'FrameSearch' not in dir(self.panel) : + # self.panel.FrameSearch = SearchFrame(self.parent, -1, u"Rechercher...", self.corpus) + # self.panel.FrameSearch.Show() @@ -560,9 +587,8 @@ def PrintRapport(self, corpus, parametres, txt = True): temps d'analyse : %s ########################### """ % parametres['time'] - file = open(self.pathout['pre_rapport'], 'w') - file.write(txt) - file.close() + with open(self.pathout['pre_rapport'], 'w') as f : + f.write(txt) class dolexlayout : def __init__(self, ira, corpus, parametres): @@ -954,27 +980,30 @@ class SimiLayout(DefaultTextLayout) : self.actives = f.read() self.actives = self.actives.splitlines()#[act for act in self.actives.splitlines()] 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'], selected = selected) - prep = PrepSimi(self.ira, self.parametres, indices_simi) - self.parametres = prep.parametres - script = PrintSimiScript(self) - script.make_script() - pid = exec_rcode(self.ira.RPath, script.scriptout, wait = True) - check_Rresult(self.ira, pid) - if self.parametres['type_graph'] == 1: - if os.path.exists(self.pathout['liste_graph']): - graph_simi = read_list_file(self.pathout['liste_graph']) - graph_simi.append([os.path.basename(script.filename), script.txtgraph]) - else : - graph_simi = [[os.path.basename(script.filename), script.txtgraph]] - print_liste(self.pathout['liste_graph'], graph_simi) - DoConf().makeoptions([self.parametres['type']], [self.parametres], self.pathout['Analyse.ira']) - if self.parametres['type_graph'] == 1: - self.graphpan.sizer_3.Add(wx.StaticBitmap(self.graphpan.panel_1, -1, wx.Bitmap(script.filename, wx.BITMAP_TYPE_ANY)), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) - self.graphpan.sizer_3.Add(wx.StaticText(self.graphpan.panel_1,-1, script.txtgraph), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) - self.graphpan.sizer_3.Fit(self.graphpan.panel_1) - self.graphpan.Layout() - self.graphpan.panel_1.Scroll(0,self.graphpan.panel_1.GetScrollRange(wx.VERTICAL)) + #res = SelectColumn(self.ira, dictcol, self.actives, self.pathout['selected.csv'], selected = selected, dlg = True) + #if res.ok : + prep = PrepSimi(self.ira, self, self.parametres,self.pathout['selected.csv'], self.actives, indices_simi, wordlist = dictcol, selected = selected) + if prep.val == wx.ID_OK : + self.parametres = prep.parametres + + script = PrintSimiScript(self) + script.make_script() + pid = exec_rcode(self.ira.RPath, script.scriptout, wait = True) + check_Rresult(self.ira, pid) + if self.parametres['type_graph'] == 1: + if os.path.exists(self.pathout['liste_graph']): + graph_simi = read_list_file(self.pathout['liste_graph']) + graph_simi.append([os.path.basename(script.filename), script.txtgraph]) + else : + graph_simi = [[os.path.basename(script.filename), script.txtgraph]] + print_liste(self.pathout['liste_graph'], graph_simi) + DoConf().makeoptions([self.parametres['type']], [self.parametres], self.pathout['Analyse.ira']) + if self.parametres['type_graph'] == 1: + self.graphpan.sizer_3.Add(wx.StaticBitmap(self.graphpan.panel_1, -1, wx.Bitmap(script.filename, wx.BITMAP_TYPE_ANY)), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) + self.graphpan.sizer_3.Add(wx.StaticText(self.graphpan.panel_1,-1, script.txtgraph), 0, wx.ALIGN_CENTER_HORIZONTAL, 0) + self.graphpan.sizer_3.Fit(self.graphpan.panel_1) + self.graphpan.Layout() + self.graphpan.panel_1.Scroll(0,self.graphpan.panel_1.GetScrollRange(wx.VERTICAL)) def export(self, evt) : pass