X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=Liste.py;h=daf58f5f698148d62137f065916ac00fdb53f37d;hp=86ec3bf25bfd79cc777032b90d46417b6e44a775;hb=3d1a621b481e251f8a086af586c7eb0bb87b0004;hpb=8fa853a25a9d62b1446e1bc543e5a3a4d0e03dcf
diff --git a/Liste.py b/Liste.py
index 86ec3bf..daf58f5 100644
--- a/Liste.py
+++ b/Liste.py
@@ -16,26 +16,20 @@
import os
import sys
import wx
-from dialog import SearchDial
+from dialog import SearchDial, message
import wx.lib.mixins.listctrl as listmix
-import cStringIO
-
+from operator import itemgetter
+from functions import doconcorde
#---------------------------------------------------------------------------
-class List(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin):
- def __init__(self, parent, ID, pos=wx.DefaultPosition,
- size=wx.DefaultSize, style=0):
- wx.ListCtrl.__init__(self, parent, ID, pos, size, style)
- listmix.ListCtrlAutoWidthMixin.__init__(self)
-
-
-class ListPanel(wx.Panel, listmix.ColumnSorterMixin):
+class ListPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin):
def __init__(self, parent, gparent, dlist):
+ wx.ListCtrl.__init__( self, parent, -1, style=wx.LC_REPORT|wx.LC_VIRTUAL|wx.LC_HRULES|wx.LC_VRULES)
self.parent = parent
self.gparent = gparent
self.source = gparent
self.dlist = dlist
- wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS)
+ #wx.Panel.__init__(self, parent, -1, style=wx.WANTS_CHARS)
search_id = wx.NewId()
self.parent.Bind(wx.EVT_MENU, self.onsearch, id = search_id)
@@ -43,97 +37,101 @@ class ListPanel(wx.Panel, listmix.ColumnSorterMixin):
self.SetAcceleratorTable(self.accel_tbl)
self.il = wx.ImageList(16, 16)
- self.sm_up = self.il.Add(getSmallUpArrowBitmap())
- self.sm_dn = self.il.Add(getSmallDnArrowBitmap())
-
+ a={"sm_up":"GO_UP","sm_dn":"GO_DOWN","w_idx":"WARNING","e_idx":"ERROR","i_idx":"QUESTION"}
+ for k,v in a.items():
+ s="self.%s= self.il.Add(wx.ArtProvider_GetBitmap(wx.ART_%s,wx.ART_TOOLBAR,(16,16)))" % (k,v)
+ exec(s)
+ self.SetImageList(self.il, wx.IMAGE_LIST_SMALL)
tID = wx.NewId()
- self.list = List(self, tID,
- style=wx.LC_REPORT
- | wx.BORDER_NONE
- | wx.LC_EDIT_LABELS
- | wx.LC_SORT_ASCENDING
- )
+#-----------------------------------------------------------------------------------------
+ self.attr1 = wx.ListItemAttr()
+ self.attr1.SetBackgroundColour((230, 230, 230))
+ self.attr2 = wx.ListItemAttr()
+ self.attr2.SetBackgroundColour("light blue")
+
- self.list.SetImageList(self.il, wx.IMAGE_LIST_SMALL)
- self.PopulateList(dlist)
+ self.InsertColumn(0, _(u'Form').decode('utf8'), wx.LIST_FORMAT_RIGHT)
+ self.InsertColumn(1, _(u'Freq.').decode('utf8'), wx.LIST_FORMAT_RIGHT)
+ self.InsertColumn(2, _(u'POS').decode('utf8'), wx.LIST_FORMAT_RIGHT)
+ #self.InsertColumn(3, '', wx.LIST_FORMAT_RIGHT)
+
+ self.SetColumnWidth(0, 150)
+ self.SetColumnWidth(1, 100)
+ self.SetColumnWidth(2, 100)
+ #self.SetColumnWidth(3, wx.LIST_AUTOSIZE)
- self.Bind(wx.EVT_SIZE, self.OnSize)
+ self.itemDataMap = dlist
+ self.itemIndexMap = dlist.keys()
+ self.SetItemCount(len(dlist))
- self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, self.list)
- self.Bind(wx.EVT_LIST_COL_CLICK, self.OnColClick, self.list)
+ #self.Bind(wx.EVT_SIZE, self.OnSize)
+
+ self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, self)
+ self.Bind(wx.EVT_LIST_COL_CLICK, self.OnColClick, self)
+ self.Bind(wx.EVT_LIST_ITEM_ACTIVATED , self.OnPopupTwo, self)
# for wxMSW
- self.list.Bind(wx.EVT_COMMAND_RIGHT_CLICK, self.OnRightClick)
+ self.Bind(wx.EVT_COMMAND_RIGHT_CLICK, self.OnRightClick)
# for wxGTK
- self.list.Bind(wx.EVT_RIGHT_UP, self.OnRightClick)
- self.itemDataMap = dlist
+ self.Bind(wx.EVT_RIGHT_UP, self.OnRightClick)
+ #listmix.ListCtrlAutoWidthMixin.__init__(self)
listmix.ColumnSorterMixin.__init__(self, 3)
self.SortListItems(1, False)
- self.do_greyline()
-#-----------------------------------------------------------------------------------------
+ #self.do_greyline()
- def PopulateList(self, dlist):
-
- #self.list.InsertColumn(0,'id', wx.LIST_FORMAT_LEFT)
-# i=1
- self.list.InsertColumn(0, 'forme', wx.LIST_FORMAT_RIGHT)
- self.list.InsertColumn(1, 'nb', wx.LIST_FORMAT_RIGHT)
- self.list.InsertColumn(2, 'type', wx.LIST_FORMAT_RIGHT)
- self.list.InsertColumn(3, '', wx.LIST_FORMAT_RIGHT)
-
- ct = 0
- for key, data in dlist.iteritems():
- ct += 1
- index = self.list.InsertStringItem(sys.maxint, data[0])
- self.list.SetStringItem(index, 1, `data[1]`)
- self.list.SetStringItem(index, 2, data[2])
- self.list.SetStringItem(index, 3, '')
- self.list.SetItemData(index, key)
-
- self.list.SetColumnWidth(0, 150)
- self.list.SetColumnWidth(1, 100)
- self.list.SetColumnWidth(2, 100)
- self.list.SetColumnWidth(3, wx.LIST_AUTOSIZE)
+ #self.currentItem = 0
+ def OnGetItemText(self, item, col):
+ index=self.itemIndexMap[item]
+ s = self.itemDataMap[index][col]
+ return s
- self.currentItem = 0
+ def OnGetItemAttr(self, item):
+ #index=self.itemIndexMap[item]
+ #genre=self.itemDataMap[index][2]
+ if item % 2 :
+ return self.attr1
+ else :
+ return self.attr2
- def do_greyline(self):
- for row in xrange(self.list.GetItemCount()):
- if row % 2 :
- self.list.SetItemBackgroundColour(row, (230, 230, 230))
- else :
- self.list.SetItemBackgroundColour(row, wx.WHITE)
-
def OnColClick(self, event):
- self.do_greyline()
+ pass
+ #self.do_greyline()
# Used by the ColumnSorterMixin, see wx/lib/mixins/listctrl.py
def GetListCtrl(self):
- return self.list
+ return self
# Used by the ColumnSorterMixin, see wx/lib/mixins/listctrl.py
def GetSortImages(self):
return (self.sm_dn, self.sm_up)
+ def SortItems(self,sorter=cmp):
+ items = list(self.itemDataMap.keys())
+ items.sort(sorter)
+ self.itemIndexMap = items
+
+ # redraw the list
+ self.Refresh()
+
def OnRightDown(self, event):
x = event.GetX()
y = event.GetY()
- item, flags = self.list.HitTest((x, y))
+ item, flags = self.HitTest((x, y))
if flags & wx.LIST_HITTEST_ONITEM:
- self.list.Select(item)
+ self.Select(item)
event.Skip()
def getColumnText(self, index, col):
- item = self.list.GetItem(index, col)
+ item = self.GetItem(index, col)
return item.GetText()
@@ -144,8 +142,8 @@ class ListPanel(wx.Panel, listmix.ColumnSorterMixin):
def onsearch(self, evt) :
self.dial = SearchDial(self, self, 0, True)
self.dial.CenterOnParent()
- self.dial.ShowModal()
- self.dial.Destroy()
+ self.dial.Show()
+ #self.dial.Destroy()
def OnRightClick(self, event):
@@ -162,8 +160,8 @@ class ListPanel(wx.Panel, listmix.ColumnSorterMixin):
# make a menu
menu = wx.Menu()
# add some items
- menu.Append(self.popupID1, u"Formes associées")
- menu.Append(self.popupID2, u"Concordancier")
+ menu.Append(self.popupID1, _(u"Associated forms").decode('utf8'))
+ menu.Append(self.popupID2, _(u"Concordance").decode('utf8'))
# menu.Append(self.popupID3, "recharger")
self.PopupMenu(menu)
@@ -172,144 +170,26 @@ class ListPanel(wx.Panel, listmix.ColumnSorterMixin):
def OnPopupOne(self, event):
corpus = self.gparent.corpus
- word = self.getColumnText(self.list.GetFirstSelected(), 0)
+ word = self.getColumnText(self.GetFirstSelected(), 0)
lems = corpus.getlems()
rep = []
for forme in lems[word].formes :
- rep.append([corpus.getforme(forme).forme, corpus.getforme(forme).freq])
- win = message(self, -1, u"Formes associées", size=(300, 200), style=wx.DEFAULT_FRAME_STYLE)
- win.html = '\n' + '
'.join([' : '.join([str(val) for val in forme]) for forme in rep]) + '\n'
- win.HtmlPage.SetPage(win.html)
+ rep.append([corpus.getforme(forme).forme, corpus.getforme(forme).freq])
+ rep.sort(key = itemgetter(1), reverse = True)
+ items = dict([[i, '' + '\t:\t'.join([str(val) for val in forme]) + ''] for i, forme in enumerate(rep)])
+ win = message(self, items, _(u"Associated forms").decode('utf8'), (300, 200))
+ #win.html = '\n' + '
'.join([' : '.join([str(val) for val in forme]) for forme in rep]) + '\n'
+ #win.HtmlPage.SetPage(win.html)
win.Show(True)
def OnPopupTwo(self, event):
corpus = self.gparent.corpus
- win = message(self, -1, u"Concordancier", size=(600, 200), style=wx.DEFAULT_FRAME_STYLE)
- avap = 60
- item = self.getColumnText(self.list.GetFirstSelected(), 0)
- listmot = corpus.getlems()[item].formes
- #uce_ok = [corpus.formes[corpus.idformes[forme].forme][1] for forme in listmot]
- uce_ok = corpus.getlemuces(item)#list(set([tuple(val) for line in uce_ok for val in line]))
- txt = 'Concordancier
'
- res = corpus.getconcorde(uce_ok)
- for uce in res :
- ucetxt = ' '+uce[1]+' '
- txt += ' '.join(corpus.ucis[corpus.getucefromid(uce[0]).uci].etoiles) + '
'
- for forme in listmot :
- forme = corpus.getforme(forme).forme
- ucetxt = ucetxt.replace(' '+forme+' ', ' ' + forme + ' ')
- txt += ucetxt + '
'
-# for uce in uce_ok:
-# content = ' '+' '.join(corpus.ucis_paras_uces[uce[0]][uce[1]][uce[2]])+' '
-# for form in listmot :
-# sp = ''
-# i = 0
-# forme = ' ' + form + ' '
-# while i < len(content):
-# coordword = content[i:].find(forme)
-# if coordword != -1 and i == 0:
-# txt += '
' + ' '.join(corpus.ucis[uce[0]][0]) + '
'
-# if coordword < avap:
-# sp = ' ' * (avap - coordword)
-# deb = i
-# else:
-# deb = i + coordword - avap
-# if len(content) < i + coordword + avap:
-# fin = len(content) - 1
-# else:
-# fin = i + coordword + avap
-# txt += '' + sp + content[deb:fin].replace(forme, '' + forme + '') + '
'
-# i += coordword + len(forme)
-# sp = ''
-# elif coordword != -1 and i != 0 :
-# if coordword < avap:
-# sp = ' ' * (avap - coordword)
-# deb = i
-# else:
-# deb = i + coordword - avap
-# if len(content) < i + coordword + avap:
-# fin = len(content) - 1
-# else:
-# fin = i + coordword + avap
-# txt += '' + sp + content[deb:fin].replace(forme, '' + forme + '') + '
'
-# i += coordword + len(forme)
-# sp = ''
-# else:
-# i = len(content)
-# sp = ''
- win.HtmlPage.SetPage(txt)
+ item = self.getColumnText(self.GetFirstSelected(), 0)
+ uce_ok = corpus.getlemuces(item)
+ ucis_txt, ucestxt = doconcorde(corpus, uce_ok, [item])
+ items = dict([[i, '
'.join([ucis_txt[i], ucestxt[i]])] for i in range(0,len(ucestxt))])
+ win = message(self, items, ' - '.join([_(u"Concordance").decode('utf8'), "%s" % item]), (800, 500), uceids = uce_ok)
+ #win = message(self, u"Concordancier", (750, 600))
+ #win.html = ('\n%s
' % item) + '
'.join(['
'.join([ucis_txt[i], ucestxt[i]]) for i in range(0,len(ucestxt))]) + '\n'
+ #win.HtmlPage.SetPage(win.html)
win.Show(True)
-
- def OnSize(self, event):
- w, h = self.GetClientSizeTuple()
- self.list.SetDimensions(0, 0, w, h)
-
-class message(wx.Frame):
- def __init__(self, *args, **kwds):
- # begin wxGlade: MyFrame.__init__
- kwds["style"] = wx.DEFAULT_FRAME_STYLE
- wx.Frame.__init__(self, *args, **kwds)
- #self.text_ctrl_1 = wx.TextCtrl(self, -1, "", style=wx.TE_MULTILINE)
- self.HtmlPage = wx.html.HtmlWindow(self, -1)
- if "gtk2" in wx.PlatformInfo:
- self.HtmlPage.SetStandardFonts()
- self.HtmlPage.SetFonts('Courier', 'Courier')
-
-
- self.button_1 = wx.Button(self, -1, "Fermer")
- self.Bind(wx.EVT_BUTTON, self.OnCloseMe, self.button_1)
- self.Bind(wx.EVT_CLOSE, self.OnCloseWindow)
- self.__do_layout()
- # end wxGlade
-
- def __do_layout(self):
- # begin wxGlade: MyFrame.__do_layout
- sizer_1 = wx.BoxSizer(wx.VERTICAL)
- sizer_2 = wx.BoxSizer(wx.VERTICAL)
- sizer_2.Add(self.HtmlPage, 1, wx.EXPAND | wx.ADJUST_MINSIZE, 0)
- sizer_2.Add(self.button_1, 0, wx.ALIGN_CENTER_HORIZONTAL | wx.ADJUST_MINSIZE, 0)
- sizer_1.Add(sizer_2, 1, wx.EXPAND, 0)
- self.SetAutoLayout(True)
- self.SetSizer(sizer_1)
- self.Layout()
- # end wxGlade
-
- def OnCloseMe(self, event):
- self.Close(True)
-
- def OnCloseWindow(self, event):
- self.Destroy()
-
-
-def getSmallUpArrowData():
- return \
-'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\
-\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\
-\x00\x00C\xb0\x89\
-\xd3.\x10\xd1m\xc3\xe5*\xbc.\x80i\xc2\x17.\x8c\xa3y\x81\x01\x00\xa1\x0e\x04e\
-?\x84B\xef\x00\x00\x00\x00IEND\xaeB`\x82"
-
-def getSmallDnArrowBitmap():
- return wx.BitmapFromImage(getSmallDnArrowImage())
-
-def getSmallDnArrowImage():
- stream = cStringIO.StringIO(getSmallDnArrowData())
- return wx.ImageFromStream(stream)