X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=tree.py;h=d8008b16b4ffa3a7dc90acf1ad17466194c71915;hp=3e05977c829471db6beaa80840a1431b3ef5358d;hb=55844beeefa19c328eae726d6a9137c2ac6be53c;hpb=54d801be487adf479497f03b1ad4557863093f88 diff --git a/tree.py b/tree.py index 3e05977..d8008b1 100644 --- a/tree.py +++ b/tree.py @@ -104,6 +104,7 @@ class LeftTree(CT.CustomTreeCtrl): elif data.startswith("EVT_"): events.append(data) self.parent = parent + self.ira = parent self.events = events self.styles = treestyles self.item = None @@ -125,6 +126,7 @@ class LeftTree(CT.CustomTreeCtrl): self.ild['chi2'] = self.il.Add(wx.Image(os.path.join(self.parent.images_path,'chi2.png'), wx.BITMAP_TYPE_PNG).Scale(16,16).ConvertToBitmap()) self.ild['reinertmatrix'] = self.il.Add(wx.Image(os.path.join(self.parent.images_path,'reinertmatrix.png'), wx.BITMAP_TYPE_PNG).Scale(16,16).ConvertToBitmap()) self.ild['simimatrix'] = self.il.Add(wx.Image(os.path.join(self.parent.images_path,'simimatrix.png'), wx.BITMAP_TYPE_PNG).Scale(16,16).ConvertToBitmap()) + self.ild['proto'] = self.il.Add(wx.Image(os.path.join(self.parent.images_path,'proto.png'), wx.BITMAP_TYPE_PNG).Scale(16,16).ConvertToBitmap()) self.SetImageList(self.il) self.count = 0 @@ -412,7 +414,13 @@ class LeftTree(CT.CustomTreeCtrl): item = self.parent.matrix_menu.FindItemByPosition(i) itemid = item.GetId() itemtext = item.GetText() - menu.Append(itemid, itemtext) + if item.IsSubMenu() : + nmenu = wx.Menu() + for val in item.GetSubMenu().GetMenuItems() : + nmenu.Append(val.GetId(), val.GetText()) + menu.AppendMenu(itemid, itemtext, nmenu) + else : + menu.Append(itemid, itemtext) split = wx.Menu() splitfromvar = split.Append(-1, _(u"Split from variable").decode('utf8')) menu.AppendMenu(-1, _(u"Split matrix").decode('utf8'), split) @@ -440,7 +448,8 @@ class LeftTree(CT.CustomTreeCtrl): 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"Export Clusters").decode('utf8')) + export_classes = menu.Append(wx.ID_ANY, _(u"Export clusters").decode('utf8')) + subcorpusfromcl = menu.Append(wx.ID_ANY, _(u"Sub corpus from clusters").decode('utf8')) menu.AppendSeparator() self.Bind(wx.EVT_MENU, self.OpenAntipro, antipro) self.Bind(wx.EVT_MENU, self.OnProfSR, profsr) @@ -451,6 +460,7 @@ class LeftTree(CT.CustomTreeCtrl): self.Bind(wx.EVT_MENU, self.StatClasse, statclasse) self.Bind(wx.EVT_MENU, self.OnRapport, rapport) self.Bind(wx.EVT_MENU, self.OnExportClasses, export_classes) + self.Bind(wx.EVT_MENU, self.OnSubCorpusFromClusters, subcorpusfromcl) elif pydata.get('type', False) == 'stat' and pydata['uuid'] in self.parent.history.opened : export_dictionary = menu.Append(wx.ID_ANY, _(u"Export dictionary").decode('utf8')) export_lems = menu.Append(wx.ID_ANY, _(u"Export lemma dictionary").decode('utf8')) @@ -466,8 +476,10 @@ class LeftTree(CT.CustomTreeCtrl): elif pydata.get('type', False) == 'reinertmatrix' and pydata['uuid'] in self.parent.history.opened : openmenu = wx.Menu() antipro = openmenu.Append(wx.ID_ANY, _(u"antiprofiles").decode('utf8')) + rapport = menu.Append(wx.ID_ANY, _(u"Report").decode('utf8')) menu.AppendMenu(wx.ID_ANY, _(u"Open ...").decode('utf8'), openmenu) self.Bind(wx.EVT_MENU, self.OpenAntipro, antipro) + self.Bind(wx.EVT_MENU, self.OnRapport, rapport) itemdelete = menu.Append(wx.ID_ANY, _(u"Delete from history").decode('utf8')) @@ -697,11 +709,16 @@ class LeftTree(CT.CustomTreeCtrl): def OnTgenCompute(self, evt): corpus = self.page.corpus tgenpath = os.path.join(self.page.parametres['pathout'], 'tgen.csv') - self.page.parametres['tgenpath'] = tgenpath - tgen = TGen(path = tgenpath, encoding = self.parent.syscoding) - self.page.parametres['etoiles'] = self.page.etoiles - TgenSpec(self.parent, corpus, self.page.parametres) - TgenLayout(self.page) + if not os.path.exists(tgenpath) : + message = wx.MessageDialog(self.parent, _(u"No TGen yet !"), style = wx.ICON_EXCLAMATION | wx.OK) + message.ShowModal() + message.Destroy() + else : + self.page.parametres['tgenpath'] = tgenpath + tgen = TGen(path = tgenpath, encoding = self.parent.syscoding) + self.page.parametres['etoiles'] = self.page.etoiles + TgenSpec(self.parent, corpus, self.page.parametres) + TgenLayout(self.page) def OnExportClasses(self, event): corpus = self.page.corpus @@ -718,6 +735,9 @@ class LeftTree(CT.CustomTreeCtrl): dial.ShowModal() dial.Destroy() + def OnSubCorpusFromClusters(self, evt): + self.parent.OnSubText(self.getcorpus(), parametres = {'fromclusters' : True, 'clnb': self.page.parametres['clnb'], 'lc' : self.page.corpus.lc}) + def OnRename(self, event): pydata = self.itemdict['pydata'] print pydata @@ -934,20 +954,21 @@ class LeftTree(CT.CustomTreeCtrl): self.SetItemBold(item, bold) self.SelectItem(item) - def OnItemAppend(self, item): + def OnItemAppend(self, item, select = True): if 'corpus_name' in item : child = self.InsertItem(self.textroot, 0, item['corpus_name']) else : child = self.InsertItem(self.matroot, 0, item['matrix_name']) self.SetPyData(child, item) - self.history.addtab(item) if item['type'] in self.ild : img = self.ild[item['type']] else : img = 24 self.SetItemImage(child, img, CT.TreeItemIcon_Normal) self.SetItemImage(child, img, CT.TreeItemIcon_Expanded) - self.SetItemBold(child, True) + if select : + self.history.addtab(item) + self.SetItemBold(child, True) #dlg = wx.TextEntryDialog(self, "Please Enter The New Item Name", 'Item Naming', 'Python') @@ -1064,7 +1085,14 @@ class LeftTree(CT.CustomTreeCtrl): if event is not None : item = event.GetItem() pydata = self.GetPyData(item) + if pydata is not None : + if 'corpus_name' in pydata : + self.ira.ShowMenu('text', True) + self.ira.ShowMenu('matrix', False) + if 'matrix_name' in pydata : + self.ira.ShowMenu('text', False) + self.ira.ShowMenu('matrix', True) self.pydata = pydata if pydata['uuid'] in self.parent.history.opened : for i in range(self.parent.nb.GetPageCount()) :