X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=openanalyse.py;h=8957f2a0598eb8e8383de22c2afbbeb43339f50c;hp=c55fef3ef3368f73079877c79bb03d6244db5328;hb=7f5e0ba6ece181a04d872a7b6eeb2f13b33aa455;hpb=1f82fb8e9ed83b8524b00039f1a8c51c2b12a8be diff --git a/openanalyse.py b/openanalyse.py index c55fef3..8957f2a 100644 --- a/openanalyse.py +++ b/openanalyse.py @@ -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) : @@ -98,9 +107,10 @@ class OpenAnalyse(): elif self.conf['type'] == 'alceste' : self.parent.ShowMenu(_("Text analysis")) OpenCHDS(self.parent, corpus, self.conf, Alceste = True) - elif self.conf['type'] == 'simitxt' : + elif self.conf['type'] == 'simitxt' or self.conf['type'] == 'clustersimitxt' : self.parent.ShowMenu(_("Text analysis")) SimiLayout(self.parent, corpus, self.conf) elif self.conf['type'] == 'wordcloud' : self.parent.ShowMenu(_("Text analysis")) WordCloudLayout(self.parent, corpus, self.conf) +