X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;f=tree.py;h=4b61d847a86add1f71fc99c13d776baa12738b36;hb=7b4b4d8970f1fe61e8bcf80e7e9c959da61cd5ab;hp=5a99753ac1e61c5e02752e2b7c45fe9329b10751;hpb=cbf4348fb7e7c5da42e3cb17c842afb4f7ea7a63;p=iramuteq
diff --git a/tree.py b/tree.py
index 5a99753..4b61d84 100755
--- a/tree.py
+++ b/tree.py
@@ -1,13 +1,28 @@
# -*- coding: utf-8 -*-
#Author: Pierre Ratinaud
-#Copyright (c) 2012, Pierre Ratinaud
-#License: GNU GPL
+#Copyright (c) 2008-2020 Pierre Ratinaud
+#modification pour python 3 : Laurent Mérat, 6x7 - mai 2020
+#License: GNU/GPL
-import wx
+#------------------------------------
+# import des modules python
+#------------------------------------
import os
import webbrowser
-import wx.lib.agw.customtreectrl as CT
import logging
+
+import langue
+langue.run()
+
+#------------------------------------
+# import des modules wx
+#------------------------------------
+import wx
+import wx.lib.agw.customtreectrl as CT
+
+#------------------------------------
+# import des fichiers du projet
+#------------------------------------
from openanalyse import OpenAnalyse
from corpus import Corpus, copycorpus
from tableau import Tableau, copymatrix
@@ -21,13 +36,15 @@ from textaslexico import TgenSpec
from textreinert import TgenProf
from mergeclustergraph import MergeClusterGraph
+
log = logging.getLogger('iramuteq.tree')
+
def buildmenu(menu, parent_menu):
for i in range(parent_menu.GetMenuItemCount()) :
item = parent_menu.FindItemByPosition(i)
itemid = item.GetId()
- itemtext = item.GetText()
+ itemtext = item.GetItemLabelText()
itemicon = item.GetBitmap()
nitem = wx.MenuItem(menu, itemid, itemtext)
nitem.SetBitmap(itemicon)
@@ -35,48 +52,42 @@ def buildmenu(menu, parent_menu):
nmenu = wx.Menu()
for val in item.GetSubMenu().GetMenuItems() :
itemid = val.GetId()
- itemtext = val.GetText()
+ itemtext = val.GetItemLabelText()
itemicon = val.GetBitmap()
nitem = wx.MenuItem(menu, itemid, itemtext)
nitem.SetBitmap(itemicon)
- nmenu.AppendItem(nitem)
- menu.AppendMenu(-1, item.GetText(), nmenu)
+ nmenu.Append(nitem)
+ menu.Append(-1, item.GetItemLabelText(), nmenu)
else :
- menu.AppendItem(nitem)
+ menu.Append(nitem)
+
class InfoDialog ( wx.Dialog ):
def __init__( self, parent, txt, parametres ):
- wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = u"Informations", pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE )
+ wx.Dialog.__init__ ( self, parent, id = wx.ID_ANY, title = "Informations", pos = wx.DefaultPosition, size = wx.DefaultSize, style = wx.DEFAULT_DIALOG_STYLE )
if len(parametres) > 30 :
nb = 4
else :
nb = 2
- self.SetSizeHintsSz( wx.Size( 500,200 ), wx.DefaultSize )
-
+ self.SetSizeHints( wx.Size( 500,200 ), wx.DefaultSize )
bSizer1 = wx.BoxSizer( wx.VERTICAL )
-
self.m_panel2 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL )
bSizer2 = wx.BoxSizer( wx.VERTICAL )
-
self.m_staticText4 = wx.StaticText( self.m_panel2, wx.ID_ANY, txt, wx.DefaultPosition, wx.DefaultSize, 0 )
self.m_staticText4.Wrap( -1 )
bSizer2.Add( self.m_staticText4, 0, wx.ALL, 5 )
-
self.m_panel2.SetSizer( bSizer2 )
self.m_panel2.Layout()
bSizer2.Fit( self.m_panel2 )
bSizer1.Add( self.m_panel2, 0, wx.EXPAND |wx.ALL, 5 )
-
self.m_panel1 = wx.Panel( self, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.TAB_TRAVERSAL|wx.VSCROLL )
-
fgSizer1 = wx.FlexGridSizer( 0, nb, 0, 0 )
fgSizer1.AddGrowableCol( 1 )
if nb == 4 :
fgSizer1.AddGrowableCol( 3 )
fgSizer1.SetFlexibleDirection( wx.BOTH )
fgSizer1.SetNonFlexibleGrowMode( wx.FLEX_GROWMODE_NONE )
-
txtctrl = []
for val in parametres :
fgSizer1.Add( wx.StaticText( self.m_panel1, wx.ID_ANY, val[0], wx.DefaultPosition, wx.DefaultSize, 0 ), 0, wx.ALL, 0)
@@ -87,19 +98,15 @@ class InfoDialog ( wx.Dialog ):
fgSizer1.Add( txtctrl[-1], 0, wx.ALL|wx.EXPAND, 0)
#fgSizer1.Add( wx.StaticLine( self.m_panel1, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ), 0, wx.EXPAND |wx.ALL, 0)
#fgSizer1.Add( wx.StaticLine( self.m_panel1, wx.ID_ANY, wx.DefaultPosition, wx.DefaultSize, wx.LI_HORIZONTAL ), 0, wx.EXPAND|wx.ALL, 0)
-
self.m_panel1.SetSizer( fgSizer1 )
self.m_panel1.Layout()
fgSizer1.Fit( self.m_panel1 )
bSizer1.Add( self.m_panel1, 1, wx.EXPAND|wx.ALL, 3 )
-
m_sdbSizer1 = wx.StdDialogButtonSizer()
self.m_sdbSizer1OK = wx.Button( self, wx.ID_OK )
m_sdbSizer1.AddButton( self.m_sdbSizer1OK )
m_sdbSizer1.Realize();
-
bSizer1.Add( m_sdbSizer1, 0, wx.EXPAND, 5 )
-
self.SetSizer( bSizer1 )
self.Layout()
bSizer1.Fit( self )
@@ -115,11 +122,11 @@ class LeftTree(CT.CustomTreeCtrl):
size=wx.DefaultSize,
style=wx.SUNKEN_BORDER|wx.WANTS_CHARS,
agwStyle=CT.TR_HIDE_ROOT|CT.TR_HAS_BUTTONS|CT.TR_HAS_VARIABLE_ROW_HEIGHT):
-
CT.CustomTreeCtrl.__init__(self, parent, id, pos, size, style, agwStyle)
#FIXME : test for bigger font on HIDPI screen
- font = wx.Font(pointSize=16, family=wx.DEFAULT, style=wx.NORMAL, weight=wx.FONTWEIGHT_NORMAL,
- underline=False, face="", encoding=wx.FONTENCODING_DEFAULT)
+ #font = wx.Font(12, wx.FONTFAMILY_DEFAULT, wx.FONTSTYLE_NORMAL, wx.FONTWEIGHT_BOLD,
+ # False, "", wx.FONTENCODING_DEFAULT)
+ font = wx.Font(pointSize=10, family=wx.FONTFAMILY_DEFAULT, style=wx.FONTSTYLE_NORMAL, weight=wx.FONTWEIGHT_NORMAL)
self.SetFont(font)
##################
self.log = log
@@ -136,47 +143,36 @@ class LeftTree(CT.CustomTreeCtrl):
self.events = events
self.styles = treestyles
self.item = None
-
-
self.il = wx.ImageList(16, 16)
self.ild = {}
for img in self.ira.images_analyses :
self.ild[img] = self.il.Add(self.ira.images_analyses[img])
self.SetImageList(self.il)
-
self.count = 0
self.log = log
-
self.history = parent.history
self.h = self.history.history
-
idopenfolder = wx.NewId()
#accel_tbl = wx.AcceleratorTable([(wx.ACCEL_CTRL, ord('E'), idopenfolder)])
self.Bind(wx.EVT_MENU, self.OnOpenFolder, id=idopenfolder)
-
idsearchcorpus = wx.NewId()
accel_tbl = wx.AcceleratorTable([(wx.ACCEL_CTRL, ord('E'), idopenfolder), (wx.ACCEL_CTRL, ord('F'), idsearchcorpus)])
self.Bind(wx.EVT_MENU, self.OnSearchCorpus, id=idsearchcorpus)
self.SetAcceleratorTable(accel_tbl)
-
self.root = self.AddRoot("Iramuteq")
-
if not(self.GetAGWWindowStyleFlag() & CT.TR_HIDE_ROOT):
self.SetPyData(self.root, None)
self.SetItemImage(self.root, 24, CT.TreeItemIcon_Normal)
self.SetItemImage(self.root, 13, CT.TreeItemIcon_Expanded)
-
- self.textroot = self.AppendItem(self.root, _(u'Textual corpus'))
+ self.textroot = self.AppendItem(self.root, _('Textual corpus'))
self.SetPyData(self.textroot, {'uuid': 'textroot'})
self.SetItemImage(self.textroot, self.ild['textroot'], CT.TreeItemIcon_Normal)
self.SetItemImage(self.textroot, self.ild['textroot'], CT.TreeItemIcon_Expanded)
-
for corpus in reversed(self.h) :
child = self.AppendItem(self.textroot, corpus['corpus_name'])
self.SetPyData(child, corpus)
self.SetItemImage(child, self.ild['corpus'], CT.TreeItemIcon_Normal)
self.SetItemImage(child, self.ild['corpus'], CT.TreeItemIcon_Expanded)
-
if 'analyses' in corpus :
for y in corpus['analyses'] :
last = self.AppendItem(child, y['name'], ct_type=0)
@@ -187,12 +183,10 @@ class LeftTree(CT.CustomTreeCtrl):
img = 24
self.SetItemImage(last, img, CT.TreeItemIcon_Normal)
self.SetItemImage(last, img, CT.TreeItemIcon_Expanded)
-
- self.matroot = self.AppendItem(self.root, _(u'Matrix'))
+ self.matroot = self.AppendItem(self.root, _('Matrix'))
self.SetPyData(self.matroot, {'uuid': 'matroot'})
self.SetItemImage(self.matroot, self.ild['matroot'], CT.TreeItemIcon_Normal)
self.SetItemImage(self.matroot, self.ild['matroot'], CT.TreeItemIcon_Expanded)
-
orphmat = []
for matrix in reversed(self.history.matrix) :
if 'matrix_name' in matrix :
@@ -212,10 +206,8 @@ class LeftTree(CT.CustomTreeCtrl):
self.SetItemImage(last, img, CT.TreeItemIcon_Expanded)
else :
orphmat.append(matrix)
-
self.Bind(wx.EVT_LEFT_DCLICK, self.OnLeftDClick)
#self.Bind(wx.EVT_IDLE, self.OnIdle)
-
self.eventdict = {'EVT_TREE_BEGIN_DRAG': self.OnBeginDrag, 'EVT_TREE_BEGIN_LABEL_EDIT': self.OnBeginEdit,
'EVT_TREE_BEGIN_RDRAG': self.OnBeginRDrag, 'EVT_TREE_DELETE_ITEM': self.OnDeleteItem,
'EVT_TREE_END_DRAG': self.OnEndDrag, 'EVT_TREE_END_LABEL_EDIT': self.OnEndEdit,
@@ -226,9 +218,7 @@ class LeftTree(CT.CustomTreeCtrl):
'EVT_TREE_ITEM_MENU': self.OnItemMenu, 'EVT_TREE_ITEM_RIGHT_CLICK': self.OnRightDown,
'EVT_TREE_KEY_DOWN': self.OnKey, 'EVT_TREE_SEL_CHANGED': self.OnSelChanged,
'EVT_TREE_SEL_CHANGING': self.OnSelChanging, "EVT_TREE_ITEM_HYPERLINK": self.OnHyperLink}
-
mainframe = wx.GetTopLevelParent(self)
-
if not hasattr(mainframe, "leftpanel"):
#self.Bind(CT.EVT_TREE_ITEM_EXPANDED, self.OnItemExpanded)
#self.Bind(CT.EVT_TREE_ITEM_COLLAPSED, self.OnItemCollapsed)
@@ -239,23 +229,17 @@ class LeftTree(CT.CustomTreeCtrl):
else:
for combos in mainframe.treeevents:
self.BindEvents(combos)
-
if hasattr(mainframe, "leftpanel"):
self.ChangeStyle(mainframe.treestyles)
-
if not(self.GetAGWWindowStyleFlag() & CT.TR_HIDE_ROOT):
self.SelectItem(self.root)
self.Expand(self.root)
-
def BindEvents(self, choice, recreate=False):
-
value = choice.GetValue()
text = choice.GetLabel()
-
evt = "CT." + text
binder = self.eventdict[text]
-
if value == 1:
if evt == "CT.EVT_TREE_BEGIN_RDRAG":
self.Bind(wx.EVT_RIGHT_DOWN, None)
@@ -267,48 +251,35 @@ class LeftTree(CT.CustomTreeCtrl):
self.Bind(wx.EVT_RIGHT_DOWN, self.OnRightDown)
self.Bind(wx.EVT_RIGHT_UP, self.OnRightUp)
-
def ChangeStyle(self, combos):
-
style = 0
for combo in combos:
if combo.GetValue() == 1:
style = style | eval("CT." + combo.GetLabel())
-
if self.GetAGWWindowStyleFlag() != style:
self.SetAGWWindowStyleFlag(style)
-
def OnCompareItems(self, item1, item2):
-
t1 = self.GetItemText(item1)
t2 = self.GetItemText(item2)
-
if t1 < t2:
return -1
if t1 == t2:
return 0
-
return 1
def OnIdle(self, event):
-
# if self.gauge:
# try:
# if self.gauge.IsEnabled() and self.gauge.IsShown():
# self.count = self.count + 1
-
# if self.count >= 50:
# self.count = 0
-
# self.gauge.SetValue(self.count)
-
# except:
# self.gauge = None
-
event.Skip()
-
def CloseItem(self, itemParent = None, uuid = None) :
if itemParent is None :
itemParent = self.root
@@ -339,7 +310,6 @@ class LeftTree(CT.CustomTreeCtrl):
if itemParent is None :
itemParent = self.root
child, cookie = self.GetFirstChild(itemParent)
-
while child :
pydata = self.GetPyData(child)
if pydata['uuid'] == uuid :
@@ -348,77 +318,60 @@ class LeftTree(CT.CustomTreeCtrl):
child, cookie = self.GetNextChild(itemParent, cookie)
return False
-
def OnRightDown(self, event):
pt = event.GetPosition()
item, flags = self.HitTest(pt)
-
if item:
self.item = item
#self.log.info("OnRightClick: %s, %s, %s" % (self.GetItemText(item), type(item), item.__class__) + "\n")
self.SelectItem(item)
-
def OnRightUp(self, event):
-
item = self.item
-
if not item:
event.Skip()
return
-
if not self.IsItemEnabled(item):
event.Skip()
return
-
# Item Text Appearance
ishtml = self.IsItemHyperText(item)
back = self.GetItemBackgroundColour(item)
fore = self.GetItemTextColour(item)
isbold = self.IsBold(item)
font = self.GetItemFont(item)
-
# Icons On Item
normal = self.GetItemImage(item, CT.TreeItemIcon_Normal)
selected = self.GetItemImage(item, CT.TreeItemIcon_Selected)
expanded = self.GetItemImage(item, CT.TreeItemIcon_Expanded)
selexp = self.GetItemImage(item, CT.TreeItemIcon_SelectedExpanded)
-
# Enabling/Disabling Windows Associated To An Item
haswin = self.GetItemWindow(item)
-
# Enabling/Disabling Items
enabled = self.IsItemEnabled(item)
-
# Generic Item's Info
children = self.GetChildrenCount(item)
itemtype = self.GetItemType(item)
text = self.GetItemText(item)
pydata = self.GetPyData(item)
self.pydata = pydata
-
self.current = item
self.itemdict = {"ishtml": ishtml, "back": back, "fore": fore, "isbold": isbold,
"font": font, "normal": normal, "selected": selected, "expanded": expanded,
"selexp": selexp, "haswin": haswin, "children": children,
"itemtype": itemtype, "text": text, "pydata": pydata, "enabled": enabled}
-
if not item in [self.textroot, self.matroot] :
menu = wx.Menu()
- info = wx.MenuItem(menu, wx.ID_ANY, _(u"Informations").decode('utf8'))
- info.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_INFORMATION, size = (16,16)))
- menu.AppendItem(info)
-
- rename = wx.MenuItem(menu, wx.ID_ANY, _(u"Rename").decode('utf8'))
- rename.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_TIP, size = (16,16)))
- menu.AppendItem(rename)
-
- openfolder = wx.MenuItem(menu, wx.ID_ANY, _(u"Open directory").decode('utf8'))
- openfolder.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_FOLDER_OPEN, size = (16,16)))
- menu.AppendItem(openfolder)
-
+ info = wx.MenuItem(menu, wx.ID_ANY, _("Informations"))
+ info.SetBitmap(wx.ArtProvider.GetBitmap(wx.ART_INFORMATION, size = (16,16)))
+ menu.Append(info)
+ rename = wx.MenuItem(menu, wx.ID_ANY, _("Rename"))
+ rename.SetBitmap(wx.ArtProvider.GetBitmap(wx.ART_TIP, size = (16,16)))
+ menu.Append(rename)
+ openfolder = wx.MenuItem(menu, wx.ID_ANY, _("Open directory"))
+ openfolder.SetBitmap(wx.ArtProvider.GetBitmap(wx.ART_FOLDER_OPEN, size = (16,16)))
+ menu.Append(openfolder)
menu.AppendSeparator()
-
if 'corpus_name' in pydata :
buildmenu(menu, self.parent.text_menu)
menu.AppendSeparator()
@@ -427,23 +380,22 @@ class LeftTree(CT.CustomTreeCtrl):
menu.AppendSeparator()
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'))
- menu.AppendMenu(wx.ID_ANY, _(u"Open ...").decode('utf8'), openmenu)
-
- translate = menu.Append(wx.ID_ANY, _(u"Translate Profile").decode('utf8'))
- profsr = menu.Append(wx.ID_ANY, _(u"Repeated segments profiles").decode('utf8'))
- profgram = menu.Append(wx.ID_ANY, _(u"POS profiles").decode('utf8'))
- stcaract = menu.Append(wx.ID_ANY, _(u"Caracteristics text segments").decode('utf8'))
- tgen = menu.Append(wx.ID_ANY, _(u"Tgen Editor").decode('utf8'))
- computetgen = menu.Append(wx.ID_ANY, _(u"Compute Tgen").decode('utf8'))
- mergeclustergraph = menu.Append(wx.ID_ANY, _(u"Merge Cluster Graph").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"Export clusters").decode('utf8'))
- subcorpusfromcl = menu.Append(wx.ID_ANY, _(u"Sub corpus from clusters").decode('utf8'))
+ antipro = openmenu.Append(wx.ID_ANY, _("Antiprofiles"))
+ menu.Append(wx.ID_ANY, _("Open ..."), openmenu)
+ translate = menu.Append(wx.ID_ANY, _("Translate Profile"))
+ profsr = menu.Append(wx.ID_ANY, _("Repeated segments profiles"))
+ profgram = menu.Append(wx.ID_ANY, _("POS profiles"))
+ stcaract = menu.Append(wx.ID_ANY, _("Typical text segments"))
+ tgen = menu.Append(wx.ID_ANY, _("Tgen Editor"))
+ computetgen = menu.Append(wx.ID_ANY, _("Compute Tgen"))
+ mergeclustergraph = menu.Append(wx.ID_ANY, _("Merge Cluster Graph"))
+ export_corpus = menu.Append(wx.ID_ANY, _("Export corpus"))
+ colored = menu.Append(wx.ID_ANY, _("Colored corpus"))
+ navig = menu.Append(wx.ID_ANY, _("Navigator"))
+ statclasse = menu.Append(wx.ID_ANY, _("Clusters statistics"))
+ rapport = menu.Append(wx.ID_ANY, _("Report"))
+ export_classes = menu.Append(wx.ID_ANY, _("Export clusters"))
+ subcorpusfromcl = menu.Append(wx.ID_ANY, _("Sub corpus from clusters"))
menu.AppendSeparator()
self.Bind(wx.EVT_MENU, self.OpenAntipro, antipro)
self.Bind(wx.EVT_MENU, self.OnTranslate, translate)
@@ -461,33 +413,31 @@ class LeftTree(CT.CustomTreeCtrl):
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'))
- export_cut_corpus = menu.Append(wx.ID_ANY, _(u"Export segmented corpus").decode('utf8'))
+ export_dictionary = menu.Append(wx.ID_ANY, _("Export dictionary"))
+ export_lems = menu.Append(wx.ID_ANY, _("Export lemma dictionary"))
+ export_cut_corpus = menu.Append(wx.ID_ANY, _("Export segmented corpus"))
self.Bind(wx.EVT_MENU, self.OnExportDictionary, export_dictionary)
self.Bind(wx.EVT_MENU, self.OnExportLems, export_lems)
self.Bind(wx.EVT_MENU, self.OnExportCutCorpus, export_cut_corpus)
menu.AppendSeparator()
elif pydata.get('type', False) == 'spec' and pydata['uuid'] in self.parent.history.opened :
- tgen = menu.Append(wx.ID_ANY, _(u"Tgen Editor").decode('utf8'))
- computetgen = menu.Append(wx.ID_ANY, _(u"Compute Tgen").decode('utf8'))
+ tgen = menu.Append(wx.ID_ANY, _("Tgen Editor"))
+ computetgen = menu.Append(wx.ID_ANY, _("Compute Tgen"))
self.Bind(wx.EVT_MENU, self.OnTgenEditor, tgen)
self.Bind(wx.EVT_MENU, self.OnTgenCompute, computetgen)
menu.AppendSeparator()
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)
+ antipro = openmenu.Append(wx.ID_ANY, _("antiprofiles"))
+ rapport = menu.Append(wx.ID_ANY, _("Report"))
+ menu.Append(wx.ID_ANY, _("Open ..."), openmenu)
self.Bind(wx.EVT_MENU, self.OpenAntipro, antipro)
self.Bind(wx.EVT_MENU, self.OnRapport, rapport)
-
- itemdelete = wx.MenuItem(menu, wx.ID_ANY, _(u"Delete from history").decode('utf8'))
- itemdelete.SetBitmap(wx.ArtProvider_GetBitmap(wx.ART_DELETE, size = (16,16)))
- menu.AppendItem(itemdelete)
+ itemdelete = wx.MenuItem(menu, wx.ID_ANY, _("Delete from history"))
+ itemdelete.SetBitmap(wx.ArtProvider.GetBitmap(wx.ART_DELETE, size = (16,16)))
+ menu.Append(itemdelete)
#item11 = menu.Append(wx.ID_ANY, "Prepend An Item")
#item12 = menu.Append(wx.ID_ANY, "Append An Item")
-
#self.Bind(wx.EVT_MENU, self.OnItemBackground, item1)
#self.Bind(wx.EVT_MENU, self.OnItemForeground, item2)
#self.Bind(wx.EVT_MENU, self.OnItemBold, item3)
@@ -502,12 +452,11 @@ class LeftTree(CT.CustomTreeCtrl):
self.Bind(wx.EVT_MENU, self.OnOpenFolder, openfolder)
#self.Bind(wx.EVT_MENU, self.OnItemPrepend, item11)
#self.Bind(wx.EVT_MENU, self.OnItemAppend, item12)
-
self.PopupMenu(menu)
menu.Destroy()
def getcorpus(self):
- busy = wx.BusyInfo(_("Please wait...Reading corpus").decode('utf8'), self.parent)
+ busy = wx.BusyInfo(_("Please wait...Reading corpus"), self.parent)
wx.SafeYield()
if self.pydata['uuid'] in self.parent.history.openedcorpus :
corpus = copycorpus(self.parent.history.openedcorpus[self.pydata['uuid']])
@@ -584,7 +533,7 @@ class LeftTree(CT.CustomTreeCtrl):
def OnMergeClusterGraph(self, evt) :
MergeClusterGraph(self.parent, self.page.corpus, self.page.parametres)
- print 'merge done !'
+ print('merge done !')
def OnStCaract(self, evt) :
dial = PrefUCECarac(self, self.parent)
@@ -593,7 +542,6 @@ class LeftTree(CT.CustomTreeCtrl):
uci = False
else :
uci = True
-
if dial.ShowModal() == wx.ID_OK :
limite = dial.spin_eff.GetValue()
atype = dial.radio_type.GetSelection()
@@ -604,7 +552,7 @@ class LeftTree(CT.CustomTreeCtrl):
for i in range(0, len(corpus.lc)) :
page = self.page.ProfNB.GetPage(i)
rcl = page.cl - 1
- dlg.Update(i, u'Cluster %i' % (i+1))
+ dlg.Update(i, 'Cluster %i' % (i+1))
uces = corpus.lc[rcl]
tab = corpus.make_table_with_classe(uces, page.la, uci = uci)
tab.pop(0)
@@ -620,11 +568,10 @@ class LeftTree(CT.CustomTreeCtrl):
ucis_txt, ucestxt = doconcorde(corpus, nuces, page.la, uci = uci)
items = ['
'.join([ucis_txt[j], '
score : %.2f |