X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=openanalyse.py;h=8957f2a0598eb8e8383de22c2afbbeb43339f50c;hp=0c0fff7be35af0a1c34f6076806a3ba76564d0f5;hb=7f5e0ba6ece181a04d872a7b6eeb2f13b33aa455;hpb=be2de22859c8f59abe9e1082981e4c3a62e9b7ca diff --git a/openanalyse.py b/openanalyse.py index 0c0fff7..8957f2a 100644 --- a/openanalyse.py +++ b/openanalyse.py @@ -12,7 +12,7 @@ from tableau import Tableau import os import shelve #from ConfigParser import * -#from tabsimi import DoSimi +from tabsimi import DoSimi from functions import BugReport, DoConf import logging @@ -33,11 +33,19 @@ class OpenAnalyse(): if self.conf['type'] == 'corpus' : corpus = self.opencorpus() elif self.conf['corpus'] in self.parent.history.corpus : + if self.conf['uuid'] in self.parent.history.analyses : + intree = True + else : + intree = False corpus = self.openanalyse() if self.conf.get('lem',1) : corpus.make_lems(True) else : corpus.make_lems(False) + if not intree : + self.parent.tree.AddAnalyse(self.conf, bold = True) + else : + self.parent.tree.GiveFocus(uuid = self.conf['uuid'], bold = True) self.doopen(corpus) else : corpus = None @@ -83,6 +91,7 @@ class OpenAnalyse(): if os.path.exists(self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira']) : corpus = Corpus(self, parametres = DoConf(self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira']).getoptions('corpus'), read = self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira']) self.parent.history.openedcorpus[self.conf['corpus']] = corpus + self.parent.history.add(self.conf) return corpus def doopen(self, corpus) : @@ -104,3 +113,4 @@ class OpenAnalyse(): elif self.conf['type'] == 'wordcloud' : self.parent.ShowMenu(_("Text analysis")) WordCloudLayout(self.parent, corpus, self.conf) +