X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=tree.py;h=8ebbe2e12fc6fea7b16028438c0c7d48111ab62c;hp=76808aa2ee5fab64611f1f1c3593d3d3d39306d4;hb=6523e3596df7ec9b7b94b875593953d4b34b6117;hpb=889c0c759bd1a27a90cbf0a1bbb3f080ab293aaf

diff --git a/tree.py b/tree.py
index 76808aa..8ebbe2e 100644
--- a/tree.py
+++ b/tree.py
@@ -159,7 +159,7 @@ class LeftTree(CT.CustomTreeCtrl):
                     else :
                         img = 24
                     self.SetItemImage(last, img, CT.TreeItemIcon_Normal)
-                    self.SetItemImage(last, 13, CT.TreeItemIcon_Expanded)
+                    self.SetItemImage(last, img, CT.TreeItemIcon_Expanded)
 
         self.matroot = self.AppendItem(self.root, u'Matrices')
         self.SetPyData(self.matroot, {'uuid': 'matroot'})
@@ -182,7 +182,7 @@ class LeftTree(CT.CustomTreeCtrl):
                         else :
                             img = 24
                         self.SetItemImage(last, img, CT.TreeItemIcon_Normal)
-                        self.SetItemImage(last, 13, CT.TreeItemIcon_Expanded)
+                        self.SetItemImage(last, img, CT.TreeItemIcon_Expanded)
             else :
                 orphmat.append(matrix)     
 
@@ -394,9 +394,9 @@ class LeftTree(CT.CustomTreeCtrl):
                 simi = menu.Append(wx.ID_ANY, _(u"Similarities analysis").decode('utf8'))
                 wdc = menu.Append(wx.ID_ANY, _(u"Wordcloud").decode('utf8'))
                 subcorpus = wx.Menu()
-                subcorpusfrommeta = subcorpus.Append(wx.ID_ANY, _(u'Sub corpora from metadata').decode('utf8'))
-                subcorpusfromtheme = subcorpus.Append(wx.ID_ANY, _(u'Sub corpora from thematic').decode('utf8'))
-                menu.AppendMenu(-1, _(u"SubCorpora").decode('utf8'), subcorpus)
+                subcorpusfrommeta = subcorpus.Append(wx.ID_ANY, _(u'Sub corpus from metadata').decode('utf8'))
+                subcorpusfromtheme = subcorpus.Append(wx.ID_ANY, _(u'Sub corpus from thematic').decode('utf8'))
+                menu.AppendMenu(-1, _(u"Subcorpus").decode('utf8'), subcorpus)
                 menu.AppendSeparator()
                 self.Bind(wx.EVT_MENU, self.OnReinert, reinert)
                 #self.Bind(wx.EVT_MENU, self.OnPam, pam)
@@ -407,28 +407,35 @@ class LeftTree(CT.CustomTreeCtrl):
                 self.Bind(wx.EVT_MENU, self.OnSubTextFromMeta, subcorpusfrommeta)
                 self.Bind(wx.EVT_MENU, self.OnSubTextFromTheme, subcorpusfromtheme)
             elif 'matrix_name' in pydata :
-                freq = menu.Append(wx.ID_ANY, _(u"Frequency").decode('utf8'))
-                chi2 = menu.Append(wx.ID_ANY, _(u"Chi square").decode('utf8'))
-                chdreinert = menu.Append(wx.ID_ANY, _(u"Reinert clustering").decode('utf8'))
-                simi = menu.Append(wx.ID_ANY, _(u"Similarity analysis").decode('utf8'))
+                for i in range(self.parent.matrix_menu.GetMenuItemCount()) :
+                    item = self.parent.matrix_menu.FindItemByPosition(i)
+                    itemid = item.GetId()
+                    itemtext = item.GetText()
+                    menu.Append(itemid, itemtext)
+                    #print item, itemid, itemtext
+                #menu = self.parent.matrix_menu
+                #freq = menu.Append(wx.ID_ANY, _(u"Frequency").decode('utf8'))
+                #chi2 = menu.Append(wx.ID_ANY, _(u"Chi square").decode('utf8'))
+                #chdreinert = menu.Append(wx.ID_ANY, _(u"Reinert clustering").decode('utf8'))
+                #simi = menu.Append(wx.ID_ANY, _(u"Similarity analysis").decode('utf8'))
                 menu.AppendSeparator()
-                self.Bind(wx.EVT_MENU, self.OnFreq, freq)
-                self.Bind(wx.EVT_MENU, self.OnChiSquare, chi2)
-                self.Bind(wx.EVT_MENU, self.OnSimiTab, simi)
-                self.Bind(wx.EVT_MENU, self.OnCHDReinert, chdreinert)
+                #self.Bind(wx.EVT_MENU, self.OnFreq, freq)
+                #self.Bind(wx.EVT_MENU, self.OnChiSquare, chi2)
+                #self.Bind(wx.EVT_MENU, self.OnSimiTab, simi)
+                #self.Bind(wx.EVT_MENU, self.OnCHDReinert, chdreinert)
             elif pydata.get('type', False) == 'alceste' and pydata['uuid'] in self.parent.history.opened :
                 openmenu = wx.Menu()
-                antipro = openmenu.Append(wx.ID_ANY, _(u"antiprofiles").decode('utf8'))
+                antipro = openmenu.Append(wx.ID_ANY, _(u"Antiprofiles").decode('utf8'))
                 menu.AppendMenu(wx.ID_ANY, _(u"Open ...").decode('utf8'), openmenu)
     
                 profsr = menu.Append(wx.ID_ANY, _(u"Repeated segments profiles").decode('utf8'))
                 profgram = menu.Append(wx.ID_ANY, _(u"POS profiles").decode('utf8'))
-                export_corpus = menu.Append(wx.ID_ANY, _(u"Export corpora").decode('utf8'))
-                colored = menu.Append(wx.ID_ANY, _(u"Colored corpora").decode('utf8'))
+                export_corpus = menu.Append(wx.ID_ANY, _(u"Export corpus").decode('utf8'))
+                colored = menu.Append(wx.ID_ANY, _(u"Colored corpus").decode('utf8'))
                 navig = menu.Append(wx.ID_ANY, _(u"Navigator").decode('utf8'))
                 statclasse = menu.Append(wx.ID_ANY, _(u"Clusters statistics").decode('utf8'))
                 rapport = menu.Append(wx.ID_ANY, _(u"Report").decode('utf8'))
-                export_classes = menu.Append(wx.ID_ANY, _(u"Exports Clusters").decode('utf8'))
+                export_classes = menu.Append(wx.ID_ANY, _(u"Export Clusters").decode('utf8'))
                 menu.AppendSeparator()
                 self.Bind(wx.EVT_MENU, self.OpenAntipro, antipro)
                 self.Bind(wx.EVT_MENU, self.OnProfSR, profsr)
@@ -571,7 +578,7 @@ class LeftTree(CT.CustomTreeCtrl):
             dlg.Destroy()
 
     def OnColored(self, evt) :
-        dial = PrefSimpleFile(self, self.parent, **{'mask' : '*.html', 'title': _(u"Colored corpora").decode('utf8')})
+        dial = PrefSimpleFile(self, self.parent, **{'mask' : '*.html', 'title': _(u"Colored corpus").decode('utf8')})
         dial.fbb.SetValue(os.path.join(os.path.dirname(self.page.dictpathout['ira']), 'corpus_couleur.html'))
         dial.CenterOnParent()
         res = dial.ShowModal()
@@ -921,7 +928,7 @@ class LeftTree(CT.CustomTreeCtrl):
         else :
             img = 24
         self.SetItemImage(child, img, CT.TreeItemIcon_Normal)
-        self.SetItemImage(child, 13, CT.TreeItemIcon_Expanded)
+        self.SetItemImage(child, img, CT.TreeItemIcon_Expanded)
         self.SetItemBold(child, True)
         
         #dlg = wx.TextEntryDialog(self, "Please Enter The New Item Name", 'Item Naming', 'Python')