X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=functions.py;h=480f2772c89dc11d1925f42fe1dec3f292922195;hp=3922fd50c081279420adc4b45c9f052e0ae92685;hb=a4932706fa82bf5c3c821ce48913db0231a2b671;hpb=22cd27b2bbe9ab1ffa7ef06fa764b5147ae17dad diff --git a/functions.py b/functions.py index 3922fd5..480f277 100644 --- a/functions.py +++ b/functions.py @@ -10,6 +10,7 @@ from ConfigParser import ConfigParser from subprocess import Popen, call, PIPE import thread import os +import ast import sys import csv import platform @@ -19,8 +20,8 @@ import locale import datetime from copy import copy from shutil import copyfile +import shelve #from dialog import BugDialog -print 'TEST LOGGING funcion' import logging log = logging.getLogger('iramuteq') @@ -35,63 +36,64 @@ class History : self.syscoding = syscoding self.corpora = {} self.openedcorpus = {} + self.orph = [] self.analyses = {} - self.history = {} + self.history = [] self.opened = {} self.read() def read(self) : - self.conf = DoConf(self.filein) - self.order = {} - self.ordera = {} - for i, section in enumerate(self.conf.conf.sections()) : - if self.conf.conf.has_option(section, 'corpus_name') : - self.corpora[section] = self.conf.getoptions(section) - self.order[len(self.order)] = section - else : - self.analyses[section] = self.conf.getoptions(section) - self.ordera[len(self.ordera)] = section - todel = [] - for corpus in self.corpora : - self.history[corpus] = copy(self.corpora[corpus]) - for analyse in self.analyses : - if self.analyses[analyse]['corpus'] in self.corpora : - if 'analyses' in self.history[self.analyses[analyse]['corpus']] : - self.history[self.analyses[analyse]['corpus']]['analyses'].append(self.analyses[analyse]) - todel.append(analyse) - else : - self.history[self.analyses[analyse]['corpus']]['analyses'] = [self.analyses[analyse]] - todel.append(analyse) - else : - self.history[analyse] = self.analyses[analyse] - #for analyse in todel : - # del self.analyses[analyse] - - def write(self) : - sections = self.corpora.keys() + self.analyses.keys() - parametres = [self.corpora[key] for key in self.corpora.keys()] + [self.analyses[key] for key in self.analyses.keys()] - self.conf.makeoptions(sections, parametres) + d = shelve.open(self.filein) + self.history = d.get('history', []) + self.ordercorpus = dict([[corpus['uuid'], i] for i, corpus in enumerate(self.history)]) + self.corpus = dict([[corpus['uuid'], corpus] for i, corpus in enumerate(self.history)]) + self.analyses = dict([[analyse['uuid'], analyse] for corpus in self.history for analyse in corpus.get('analyses', [])]) + d.close() + def write(self) : + d = shelve.open(self.filein) + d['history'] = self.history + d.close() + def add(self, analyse) : - if 'corpus' in analyse : - if analyse['corpus'] in self.corpora : - if 'analyses' in self.history[analyse['corpus']] : - self.history[analyse['corpus']]['analyses'].append(analyse) + log.info('add to history %s' % analyse.get('corpus_name', 'pas un corpus')) + tosave = {'uuid' : analyse['uuid'], 'ira': analyse['ira'], 'type' : analyse['type']} + if analyse.get('corpus', False) : + if analyse['uuid'] in self.analyses : + return + tosave['corpus'] = analyse['corpus'] + tosave['name'] = analyse['name'] + acorpus_uuid = analyse['corpus'] + if acorpus_uuid in self.ordercorpus : + if 'analyses' in self.history[self.ordercorpus[acorpus_uuid]] : + self.history[self.ordercorpus[acorpus_uuid]]['analyses'].append(tosave) else : - self.history[analyse['corpus']]['analyses'] = [analyse] - self.analyses[analyse['uuid']] = analyse + self.history[self.ordercorpus[acorpus_uuid]]['analyses'] = [tosave] else : - self.analyses[analyse['uuid']] = analyse - elif 'corpus_name' in analyse : - self.history[analyse['uuid']] = analyse - self.corpora[analyse['uuid']] = analyse + self.orph.append(tosave) + else : + tosave['corpus_name'] = analyse['corpus_name'] + self.history.append(tosave) self.write() + self.read() + + def delete(self, analyse, corpus = False) : + if corpus : + self.history.pop(self.ordercorpus[analyse['uuid']]) + else : + todel = [i for i, ana in enumerate(self.corpus[analyse['corpus']]['analyses']) if ana['uuid'] == analyse['uuid']][0] + self.history[self.ordercorpus[analyse['corpus']]]['analyses'].pop(todel) + self.write() + self.read() def addtab(self, analyse) : self.opened[analyse['uuid']] = analyse def rmtab(self, analyse) : del self.opened[analyse['uuid']] + + def __str__(self) : + return str(self.history) class DoConf : def __init__(self, configfile=None, diff = None, parametres = None) : @@ -116,6 +118,14 @@ class DoConf : for option in self.conf.options(section) : if self.conf.get(section, option).isdigit() : parametres[option] = int(self.conf.get(section, option)) + elif self.conf.get(section, option) == 'False' : + parametres[option] = False + elif self.conf.get(section, option) == 'True' : + parametres[option] = True + elif self.conf.get(section, option).startswith('(') and self.conf.get(section, option).endswith(')') : + parametres[option] = ast.literal_eval(self.conf.get(section, option)) + elif self.conf.get(section, option).startswith('[') and self.conf.get(section, option).endswith(']') : + parametres[option] = ast.literal_eval(self.conf.get(section, option)) else : parametres[option] = self.conf.get(section, option) if 'type' not in parametres : @@ -123,26 +133,44 @@ class DoConf : return parametres def makeoptions(self, sections, parametres, outfile = None) : + txt = '' for i, section in enumerate(sections) : + txt += '[%s]\n' % section if not self.conf.has_section(section) : self.conf.add_section(section) for option in parametres[i] : if isinstance(parametres[i][option], int) : self.conf.set(section, option, `parametres[i][option]`) + txt += '%s = %i\n' % (option, parametres[i][option]) elif isinstance(parametres[i][option], basestring) : self.conf.set(section, option, parametres[i][option].encode('utf8')) + txt += '%s = %s\n' % (option, parametres[i][option]) + elif isinstance(parametres[i][option], wx.Colour) : + self.conf.set(section, option, str(parametres[i][option])) + txt += '%s = %s\n' % (option, str(parametres[i][option])) + elif option == 'analyses' : + pass + else : + self.conf.set(section, option, `parametres[i][option]`) + txt += '%s = %s\n' % (option, `parametres[i][option]`) if outfile is None : outfile = self.configfile with codecs.open(outfile, 'w', 'utf8') as f : - self.conf.write(f) + f.write(txt) + #self.conf.write(f) def totext(self, parametres) : - txt = ['Corpus'] + #txt = ['Corpus'] + txt = [] for val in parametres : if isinstance(parametres[val], int) : txt.append(' \t\t: '.join([val, `parametres[val]`])) - else : + elif isinstance(parametres[val], basestring) : txt.append(' \t\t: '.join([val, parametres[val]])) + elif val in ['listet', 'stars'] : + pass + else : + txt.append(' \t\t: '.join([val, `parametres[val]`])) return '\n'.join(txt) @@ -282,8 +310,8 @@ def formatExceptionInfo(maxTBlevel=5): cla, exc, trbk = sys.exc_info() excName = cla.__name__ try: - excArgs = exc.__dict__["args"] - except KeyError: + excArgs = exc.args[0] + except : excArgs = "" excTb = traceback.format_tb(trbk, maxTBlevel) return (excName, excArgs, excTb) @@ -296,7 +324,7 @@ def decoupercharact(chaine, longueur, longueurOptimale, separateurs = None) : Si on trouve un '$', c'est fini. Sinon, on cherche le meilleur candidat. C'est-à-dire le rapport poids/distance le plus important. """ - separateurs = [[u'.', 60.0], [u'?', 60.0], [u'!', 60.0], [u'£', 60], [u':', 50.0], [u';', 40.0], [u',', 10.0], [u' ', 0.1]] + separateurs = [[u'.', 60.0], [u'?', 60.0], [u'!', 60.0], [u'£$£', 60], [u':', 50.0], [u';', 40.0], [u',', 10.0], [u' ', 0.1]] trouve = False # si on a trouvé un bon séparateur iDecoupe = 0 # indice du caractere ou il faut decouper @@ -346,28 +374,38 @@ def decoupercharact(chaine, longueur, longueurOptimale, separateurs = None) : # si on a rien trouvé return False, chaine.split(), '' -def BugReport(parent): +def BugReport(parent, error = None): for ch in parent.GetChildren(): if "" == str(type(ch)): ch.Destroy() + excName, exc, excTb = formatExceptionInfo() + if excName == 'Exception' : + txt = 'Message :\n' + else : + txt = u' !== BUG ==! \n' + txt += u'*************************************\n' + txt += '\n'.join(excTb).replace(' ', ' ') + txt += excName + '\n' + txt += exc + dial = BugDialog(parent) - txt = u' !== BUG ==! \n' - txt += u'*************************************\n' - for line in formatExceptionInfo(): - if type(line) == type([]): - for don in line: - txt += don.replace(' ', ' ') - else: - txt += line + '\n' + #for line in formatExceptionInfo(): + # if type(line) == type([]): + # for don in line: + # txt += don.replace(' ', ' ') + # else: + # txt += line + '\n' if 'Rerror' in dir(parent) : txt += parent.Rerror parent.Rerror = '' + #if error is not None : + # txt += '\n%s\n' %error print formatExceptionInfo() log.error(txt) dial.text_ctrl_1.write(txt) dial.CenterOnParent() dial.ShowModal() - raise NameError('Bug') + #raise Exception('Bug') def PlaySound(parent): if parent.pref.getboolean('iramuteq', 'sound') : @@ -390,8 +428,14 @@ def ReadDicoAsDico(dicopath): dico[line[0]] = line[1:] return dico -def ReadLexique(parent, lang = 'french'): - parent.lexique = ReadDicoAsDico(parent.DictPath.get(lang, 'french')) +def ReadLexique(parent, lang = 'french', filein = None): + if lang != 'other' : + if filein is None : + parent.lexique = ReadDicoAsDico(parent.DictPath.get(lang, 'french')) + else : + parent.lexique = ReadDicoAsDico(filein) + else : + parent.lexique = {} def ReadList(filein, encoding = sys.getdefaultencoding()): #file = open(filein) @@ -420,7 +464,7 @@ def ReadList(filein, encoding = sys.getdefaultencoding()): return dict, first def exec_rcode(rpath, rcode, wait = True, graph = False): - print rpath, rcode + log.info("R Script : %s" % rcode) needX11 = False if sys.platform == 'darwin' : try : @@ -480,7 +524,7 @@ def check_Rresult(parent, pid) : except : BugReport(parent) else : - if pid !=0 : + if pid != 0 : try : raise Exception(u'Erreur R') except : @@ -497,47 +541,42 @@ def read_list_file(filename, encoding = sys.getdefaultencoding()): ncontent=[line.replace('\n','').split(';') for line in content if line.strip() != ''] return ncontent -class MessageImage(wx.Frame): - def __init__(self, *args, **kwds): - # begin wxGlade: MyFrame.__init__ - kwds["style"] = wx.DEFAULT_FRAME_STYLE - wx.Frame.__init__(self, *args, **kwds) - #self.text_ctrl_1 = wx.TextCtrl(self, -1, "", style=wx.TE_MULTILINE) +class MessageImage(wx.Dialog): + def __init__(self, parent,title, size): + wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = title, pos = wx.DefaultPosition, size = size, style = wx.DEFAULT_DIALOG_STYLE ) + self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize ) self.imageFile = False self.imagename = u"chi_classe.png" self.HtmlPage = wx.html.HtmlWindow(self, -1) + self.HtmlPage.SetMinSize(size) if "gtk2" in wx.PlatformInfo: self.HtmlPage.SetStandardFonts() self.HtmlPage.SetFonts('Courier', 'Courier') - self.button_1 = wx.Button(self, -1, u"Fermer") + self.button_1 = wx.Button(self, wx.ID_CANCEL) + self.button_2 = wx.Button(self, wx.ID_SAVE) self.Bind(wx.EVT_BUTTON, self.OnCloseMe, self.button_1) - self.Bind(wx.EVT_CLOSE, self.OnCloseWindow) - self.__do_layout() - # end wxGlade - - def __do_layout(self): - # begin wxGlade: MyFrame.__do_layout - sizer_1 = wx.BoxSizer(wx.VERTICAL) - self.sizer_2 = wx.BoxSizer(wx.VERTICAL) - self.sizer_2.Add(self.HtmlPage, 1, wx.EXPAND | wx.ADJUST_MINSIZE, 0) - self.sizer_2.Add(self.button_1, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ADJUST_MINSIZE, 0) - sizer_1.Add(self.sizer_2, 1, wx.EXPAND, 0) - self.SetAutoLayout(True) - self.SetSizer(sizer_1) - # end wxGlade - - def addsaveimage(self, imageFile) : - self.imageFile = imageFile - self.button_2 = wx.Button(self, -1, u"Enregistrer l'image...") self.Bind(wx.EVT_BUTTON, self.OnSaveImage, self.button_2) - self.sizer_2.Add(self.button_2, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ADJUST_MINSIZE, 0) + self.do_layout() + + def do_layout(self): + self.sizer_1 = wx.BoxSizer(wx.VERTICAL) + self.sizer_2 = wx.BoxSizer(wx.HORIZONTAL) + self.sizer_1.Add(self.HtmlPage, 2, wx.EXPAND, 0) + + self.m_sdbSizer1 = wx.StdDialogButtonSizer() + self.m_sdbSizer1.AddButton( self.button_2 ) + self.m_sdbSizer1.AddButton( self.button_1 ) + self.m_sdbSizer1.Realize() + self.sizer_1.Add(self.m_sdbSizer1, 0, wx.EXPAND, 5) + self.SetSizer(self.sizer_1) self.Layout() + self.sizer_1.Fit( self ) + def addsaveimage(self, imageFile) : + self.imageFile = imageFile + def OnCloseMe(self, event): - self.Close(True) - - def OnCloseWindow(self, event): self.Destroy() def OnSaveImage(self, event) :