X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=layout.py;h=8cfcd962ed5ce26ee61cc3f3d3595411bf3e07c7;hp=b80e08cba2f1ec5c986e72c55bcdb0f60f05869a;hb=ad8fe486b34f1cee918ea8564bf909e30cd25328;hpb=1fb687c23b19ae4cc88146acf393041356c1df3a diff --git a/layout.py b/layout.py index b80e08c..8cfcd96 100644 --- a/layout.py +++ b/layout.py @@ -7,8 +7,10 @@ import os import wx import wx.lib.hyperlink as hl -#import wx.lib.agw.aui as aui -import agw.aui as aui +if wx.__version__ >= '2.11' : + import wx.lib.agw.aui as aui +else : + import 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, check_Rresult, progressbar @@ -22,12 +24,11 @@ from Liste import * from search_tools import SearchFrame from dialog import PrefGraph, PrefExport, PrefSimpleFile, PrefDendro from guifunct import SelectColumn, PrepSimi -from corpusNG import Corpus +from corpus import Corpus import datetime import sys import tempfile import shutil -#import webbrowser import codecs import logging @@ -249,7 +250,7 @@ class GraphPanel(wx.ScrolledWindow): self.Dict = dico self.txt = txt self.parent = parent - self.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "courier")) + self.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.FONTWEIGHT_BOLD, 0, "courier")) self.labels = [] self.listimg = [] self.dirout = os.path.dirname(self.Dict['ira']) @@ -304,16 +305,16 @@ class OpenCHDS(): Profile = DictPathOut['PROFILE_OUT'] AntiProfile = DictPathOut['ANTIPRO_OUT'] + self.encoding = self.corpus.parametres['syscoding'] if isinstance(self.corpus, Corpus) : - self.encoding = self.corpus.parametres['syscoding'] self.corpus.make_ucecl_from_R(self.pathout['uce']) - elif 'tableau' in dir(gparent) : - self.encoding = gparent.tableau.parametres['syscoding'] + corpname = self.corpus.parametres['corpus_name'] + else : + corpname = self.corpus.parametres['name'] clnb = parametres['clnb'] dlg = progressbar(self, maxi = 4 + clnb) self.clnb = clnb - corpname = self.corpus.parametres['corpus_name'] print 'lecture des profils' dlg.Update(2, u'lecture des profils') @@ -337,12 +338,14 @@ class OpenCHDS(): if isinstance(self.corpus, Corpus) : panel.corpus = self.corpus - 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 + else : + panel.tableau = self.corpus + 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() @@ -366,8 +369,11 @@ class OpenCHDS(): if isinstance(self.corpus, Corpus) : panel.TabChdSim.corpus = corpus panel.TabChdSim.corpus.dictpathout = self.DictPathOut - panel.parametres = self.parametres - self.panel = panel + else : + panel.TabChdSim.tableau = corpus + panel.TabChdSim.tableau.dictpathout = self.DictPathOut + panel.parametres = self.parametres + self.panel = panel self.notenb = self.parent.nb.GetPageCount() @@ -543,7 +549,7 @@ class OpenCHDS(): -def PrintRapport(self, corpus, parametres, txt = True): +def PrintRapport(self, corpus, parametres, istxt = True): #if sys.platform == 'win32': # sep = '\r\n' #else: @@ -555,10 +561,10 @@ def PrintRapport(self, corpus, parametres, txt = True): """ % datetime.datetime.now().ctime() - totocc = corpus.gettotocc() - if txt : - txt += u'nombre d\'uci: %i%s' % (corpus.getucinb(), sep) - txt += u'nombre d\'uce: %i%s' % (corpus.getucenb(), sep) + 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) @@ -568,28 +574,26 @@ def PrintRapport(self, corpus, parametres, txt = True): 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 uce :%f%s' % (float(totocc) / float(corpus.getucenb()), sep) if 'tailleuc1' in parametres : - if parametres['classif_mode'] != 0 : - txt += u'taille uc1 : %i\n' % parametres['tailleuc1'] - else: - txt += u'taille uc1 / uc2: %i / %i - %i / %i%s' % (parametres['tailleuc1'], parametres['tailleuc2'], parametres['lenuc1'], parametres['lenuc2'], sep) - elif not txt : + if parametres['classif_mode'] == 0 : + txt += u'taille rst1 / rst2: %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) - if txt : + if istxt : txt += u'nombre de classes : %i%s' % (parametres['clnb'], sep) if parametres['classif_mode'] == 0 or parametres['classif_mode'] == 1 : - txt += u'%i uce classées 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 += 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) elif self.parametres['classif_mode'] == 2 : - txt += u'%i uci classées 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) - elif analyse == 'quest' : + 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) + else : txt += u'%i uce classées sur %i (%.2f%%)%s' % (self.ucecla, self.Ucenb, (float(self.ucecla) / float(self.Ucenb)) * 100, sep) txt += """ ########################### temps d'analyse : %s ########################### -""" % parametres['time'] +""" % parametres.get('time', '') with open(self.pathout['pre_rapport'], 'w') as f : f.write(txt) @@ -685,12 +689,13 @@ class GraphPanelDendro(wx.Panel): self.dirout = os.path.dirname(self.dictpathout['ira']) self.list_graph = list_graph self.parent = self.GetParent()#parent - self.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "courier")) + self.SetFont(wx.Font(10, wx.DEFAULT, wx.NORMAL, wx.NORMAL, 0, "Arial")) self.labels = [] self.listimg = [] self.tabchd = self.parent.GetParent() self.ira = self.tabchd.GetParent() self.panel_1 = wx.ScrolledWindow(self, -1, style=wx.TAB_TRAVERSAL) + 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() self.butdendro = wx.BitmapButton(self, -1, dendro_img)