X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=tree.py;h=aa4d00da2d032ecfc89ec167ea8ce32da9cf7e38;hp=1a9b6fd1fc211051b38204331acce98e754f023a;hb=b5603a452507554481981b32147a60c17151cade;hpb=a6c0faa62f33e5e64ad7eab5b9d804be99c6759a

diff --git a/tree.py b/tree.py
index 1a9b6fd..aa4d00d 100644
--- a/tree.py
+++ b/tree.py
@@ -125,6 +125,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
@@ -440,7 +441,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 +453,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 +469,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 +702,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 +728,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
@@ -903,6 +916,7 @@ class LeftTree(CT.CustomTreeCtrl):
         self.SetItemImage(item, img, CT.TreeItemIcon_Normal)
         self.SetItemImage(item, 13, CT.TreeItemIcon_Expanded)
         self.SetItemBold(item, bold)
+        self.SelectItem(item)
     
     def AddMatAnalyse(self, parametres, itemParent = None, bold = True) :
         uuid = parametres.get('matrix', None)
@@ -930,7 +944,8 @@ class LeftTree(CT.CustomTreeCtrl):
             img = 24
         self.SetItemImage(item, img, CT.TreeItemIcon_Normal)
         self.SetItemImage(item, 13, CT.TreeItemIcon_Expanded)
-        self.SetItemBold(item, bold)    
+        self.SetItemBold(item, bold)
+        self.SelectItem(item)  
         
     def OnItemAppend(self, item):
         if 'corpus_name' in item :