From b563d3428deb1e62062d8af0fd3dfa2e329930bd Mon Sep 17 00:00:00 2001 From: Pierre Ratinaud Date: Tue, 18 Nov 2014 11:34:48 +0100 Subject: [PATCH] ... --- layout.py | 9 --------- openanalyse.py | 12 ++++++------ tree.py | 4 ++-- 3 files changed, 8 insertions(+), 17 deletions(-) diff --git a/layout.py b/layout.py index a4834dd..b362300 100644 --- a/layout.py +++ b/layout.py @@ -974,17 +974,8 @@ class MatLayout : ira.nb.AddPage(self.sheet, matrix.parametres['matrix_name']) self.sheet.Populate(matrix.csvtable) self.sheet.parametres = matrix.parametres - #self.ira.ShowMenu(_(u"View").decode('utf8')) - #self.ira.ShowMenu(_(u"Matrix analysis").decode('utf8')) - #self.ira.ShowMenu(_(u"Text analysis").decode('utf8'), False) - #self.parent.type = "Data" - #self.parent.DataPop = False ira.nb.SetSelection(ira.nb.GetPageCount() - 1) ira.ShowAPane("Tab_content") - #self.ira.OnViewData('') - - - class CopusPanel(wx.Panel) : def __init__(self, parent, parametres) : diff --git a/openanalyse.py b/openanalyse.py index f8c32bb..eb38055 100644 --- a/openanalyse.py +++ b/openanalyse.py @@ -149,22 +149,22 @@ class OpenAnalyse(): def doopen(self, corpus) : if self.conf['type'] == 'corpus' : - self.parent.ShowMenu(_("Text analysis")) + #self.parent.ShowMenu(_("Text analysis")) OpenCorpus(self.parent, self.conf) elif self.conf['type'] == 'stat' : - self.parent.ShowMenu(_("Text analysis")) + #self.parent.ShowMenu(_("Text analysis")) StatLayout(self.parent, corpus, self.conf) elif self.conf['type'] == 'spec' : - self.parent.ShowMenu(_("Text analysis")) + #self.parent.ShowMenu(_("Text analysis")) dolexlayout(self.parent, corpus, self.conf) elif self.conf['type'] == 'alceste' : - self.parent.ShowMenu(_("Text analysis")) + #self.parent.ShowMenu(_("Text analysis")) OpenCHDS(self.parent, corpus, self.conf, Alceste = True) elif self.conf['type'] == 'simitxt' or self.conf['type'] == 'clustersimitxt' : - self.parent.ShowMenu(_("Text analysis")) + #self.parent.ShowMenu(_("Text analysis")) SimiLayout(self.parent, corpus, self.conf) elif self.conf['type'] == 'wordcloud' or self.conf['type'] == 'clustercloud': - self.parent.ShowMenu(_("Text analysis")) + #self.parent.ShowMenu(_("Text analysis")) WordCloudLayout(self.parent, corpus, self.conf) elif self.conf['type'] == 'reinertmatrix' : #self.parent.ShowMenu(_("Spreadsheet analysis")) diff --git a/tree.py b/tree.py index d8008b1..d1df2d6 100644 --- a/tree.py +++ b/tree.py @@ -1087,10 +1087,10 @@ class LeftTree(CT.CustomTreeCtrl): pydata = self.GetPyData(item) if pydata is not None : - if 'corpus_name' in pydata : + if 'corpus_name' in pydata or 'corpus' in pydata : self.ira.ShowMenu('text', True) self.ira.ShowMenu('matrix', False) - if 'matrix_name' in pydata : + if 'matrix_name' in pydata or 'matrix' in pydata: self.ira.ShowMenu('text', False) self.ira.ShowMenu('matrix', True) self.pydata = pydata -- 2.7.4