X-Git-Url: http://www.iramuteq.org/git?a=blobdiff_plain;f=search_list.py;h=6aff98b99e792ed5fa149b3006a418647c3be7c0;hb=refs%2Fheads%2F3.0;hp=74859842b6635a48361ace8edc7162e4970b4990;hpb=6523e3596df7ec9b7b94b875593953d4b34b6117;p=iramuteq
diff --git a/search_list.py b/search_list.py
index 7485984..6aff98b 100644
--- a/search_list.py
+++ b/search_list.py
@@ -1,10 +1,11 @@
# -*- coding: utf-8 -*-
+#Author: Pierre Ratinaud
+#Copyright (c) 2008-2020 Pierre Ratinaud
+#modification pour python 3 : Laurent Mérat, 6x7 - mai 2020
+#License: GNU/GPL
#----------------------------------------------------------------------------
-# Author: Pierre Ratinaud
-#
-
-#comes from ListCtrl.py from the demo tool of wxPython:
+# comes from ListCtrl.py from the demo tool of wxPython:
# Author: Robin Dunn & Gary Dumer
#
# Created:
@@ -12,18 +13,30 @@
# Licence: wxWindows license
#----------------------------------------------------------------------------
+#------------------------------------
+# import des modules python
+#------------------------------------
import os
import sys
-import wx
-import wx.lib.mixins.listctrl as listmix
-import cStringIO
+import io
import tempfile
+
+#------------------------------------
+# import des modules wx
+#------------------------------------
+import wx
+import wx.lib.mixins.listctrl as listmix
+
+#------------------------------------
+# import des fichiers du projet
+#------------------------------------
from functions import exec_rcode
from dialog import message, BarFrame
from chemins import ffr
-#---------------------------------------------------------------------------
+
class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin): #wx.Panel, listmix.ColumnSorterMixin):
+
def __init__(self, parent,gparent, dlist,first, nbactives, nbetoiles, add_dendro=True):
wx.ListCtrl.__init__( self, parent, -1, style=wx.LC_REPORT|wx.LC_VIRTUAL|wx.LC_HRULES|wx.LC_VRULES)
self.parent=parent
@@ -33,15 +46,13 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort
self.first = ['id','formes'] + first
self.lenact = nbactives
self.lensup = len(dlist) - (self.lenact + nbetoiles)
-
#adding some art
self.il = wx.ImageList(16, 16)
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)
+ for k,v in list(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)
-
self.attr1 = wx.ListItemAttr()
self.attr1.SetBackgroundColour((220, 220, 220))
self.attrsg = wx.ListItemAttr()
@@ -49,42 +60,31 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort
self.attr2 = wx.ListItemAttr()
self.attr2.SetBackgroundColour((190, 249, 236))
self.attr2s = wx.ListItemAttr()
- self.attr2s.SetBackgroundColour((211, 252, 244))
+ self.attr2s.SetBackgroundColour((211, 252, 244))
self.attr3 = wx.ListItemAttr()
self.attr3.SetBackgroundColour((245, 180, 180))
self.attr3s = wx.ListItemAttr()
self.attr3s.SetBackgroundColour((245, 190, 190))
-
tID = wx.NewId()
-
self.dlist = dlist
-
self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, self)
#self.Bind(wx.EVT_LIST_COL_CLICK, self.OnColClick)
-
# for wxMSW
self.Bind(wx.EVT_COMMAND_RIGHT_CLICK, self.OnRightClick)
-
# for wxGTK
self.Bind(wx.EVT_RIGHT_UP, self.OnRightClick)
-
-
- self.itemDataMap = dlist
- self.itemIndexMap = dlist.keys()
- self.SetItemCount(len(dlist))
- listmix.ColumnSorterMixin.__init__(self, len(first)+2)
-
-
-#-----------------------------------------------------------------------------------------
+ #-----------------------------------------------------------
first = ['id','formes']+first
for i, name in enumerate(first) :
self.InsertColumn(i, name, wx.LIST_FORMAT_LEFT)
-
self.SetColumnWidth(0, wx.LIST_AUTOSIZE)
for i in range(1,len(first)-1):
self.SetColumnWidth(i, 130)
-
+ self.itemDataMap = dlist
+ self.itemIndexMap = list(dlist.keys())
+ self.SetItemCount(len(dlist))
+ listmix.ColumnSorterMixin.__init__(self, len(first)+2)
self.SortListItems(0, True)
# Used by the ColumnSorterMixin, see wx/lib/mixins/listctrl.py
@@ -95,15 +95,18 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort
def GetSortImages(self):
return (self.sm_dn, self.sm_up)
+ def OnGetItemColumnImage(self, item, col):
+ return -1
+
+ def OnGetItemImage(self, item):
+ pass
def OnRightDown(self, event):
x = event.GetX()
y = event.GetY()
item, flags = self.HitTest((x, y))
-
if flags & wx.LIST_HITTEST_ONITEM:
self.Select(item)
-
event.Skip()
def getColumnText(self, index, col):
@@ -113,7 +116,10 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort
def OnGetItemText(self, item, col):
index=self.itemIndexMap[item]
s = self.itemDataMap[index][col]
- return s
+ if isinstance(s, (int,float)):
+ return str(s)
+ else :
+ return s
def OnGetItemData(self, item) :
index = self.itemIndexMap[item]
@@ -145,38 +151,35 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort
else :
return None
- def SortItems(self,sorter=cmp):
- items = list(self.itemDataMap.keys())
- items.sort(sorter)
- self.itemIndexMap = items
-
- # redraw the list
- self.Refresh()
+# def SortItems(self,sorter=cmp): ancienne version pour python 2
+ def SortItems(self, sorter=None):
+ listTemp = sorted(self.itemDataMap.items(),
+ key=lambda x:x[1][self._col], reverse= (self._colSortFlag[self._col]!=True))
+ dlist = dict([[line[0],line[1]] for line in listTemp])
+ self.itemDataMap = dlist
+ self.itemIndexMap = list(dlist.keys())
+ self.Refresh() # redraw the list
def OnRightClick(self, event):
-
# only do this part the first time so the events are only bound once
if not hasattr(self, "popupID1"):
-# self.popupID1 = wx.NewId()
+ #self.popupID1 = wx.NewId()
#self.popupID2 = wx.NewId()
self.popupID3 = wx.NewId()
if self.add_dendro :
self.id_adddendro = wx.NewId()
self.Bind(wx.EVT_MENU, self.ongraphdendro, id = self.id_adddendro)
-# self.Bind(wx.EVT_MENU, self.OnPopupOne, id=self.popupID1)
+ #self.Bind(wx.EVT_MENU, self.OnPopupOne, id=self.popupID1)
#self.Bind(wx.EVT_MENU, self.OnPopupTwo, id=self.popupID2)
self.Bind(wx.EVT_MENU, self.OnPopupThree, id=self.popupID3)
-
-
# 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, "Formes associées")
+ #menu.Append(self.popupID2, "Concordancier")
menu.Append(self.popupID3, "Graphique")
if self.add_dendro :
- menu.Append(self.id_adddendro, u"Graphique + dendrogramme")
-
+ menu.Append(self.id_adddendro, "Graphique + dendrogramme")
self.PopupMenu(menu)
menu.Destroy()
@@ -197,7 +200,7 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort
rep = []
for forme in lems[word] :
rep.append([forme, corpus.formes[forme][0]])
- win = message(self, u"Formes associées", size=(300, 200))
+ win = message(self, "Formes associées", size=(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)
@@ -207,7 +210,7 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort
page = self.parent.nb.GetPage(activenotebook)
item=self.getColumnText(self.GetFirstSelected(), 0)
corpus = page.corpus
- win = message(self, u"Concordancier", size=(600, 200))
+ win = message(self, "Concordancier", size=(600, 200))
avap=60
listmot = corpus.lems[item]
uce_ok = [corpus.formes[forme][1] for forme in listmot]
@@ -265,17 +268,6 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort
rownames = [val[1] for val in datas]
table = [[str(val) for val in line[2:]] for line in datas]
BarFrame(self.parent.parent, table, colnames, rownames)
-# tmpgraph = tempfile.mktemp(dir=self.parent.parent.TEMPDIR)
-# txt = barplot(table, rownames, colnames, self.parent.parent.RscriptsPath['Rgraph'], tmpgraph)
-# tmpscript = tempfile.mktemp(dir=self.parent.parent.TEMPDIR)
-# with open(tmpscript,'w') as f :
-# f.write(txt)
-# exec_rcode(self.parent.parent.RPath, tmpscript, wait = True)
-# win = MessageImage(self, u"Graphique", size=(700, 500))
-# win.addsaveimage(tmpgraph)
-# txt = "
" % tmpgraph
-# win.HtmlPage.SetPage(txt)
-# win.Show(True)
def ongraphdendro(self, evt) :
corpus = self.parent.corpus
@@ -290,13 +282,3 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort
table = [[str(val) for val in line[2:]] for line in datas]
tmpgraph = tempfile.mktemp(dir=self.parent.parent.TEMPDIR)
BarFrame(self.parent.parent, table, colnames, rownames, tree = corpus.dictpathout['Rdendro'])
-# txt = dendroandbarplot(table, rownames, colnames, self.parent.parent.RscriptsPath['Rgraph'], tmpgraph, dendro=corpus.dictpathout['Rdendro'])
-# tmpscript = tempfile.mktemp(dir=self.parent.parent.TEMPDIR)
-# with open(tmpscript,'w') as f :
-# f.write(txt)
-# exec_rcode(self.parent.parent.RPath, tmpscript, wait = True)
-# win = MessageImage(self, u"Graphique", size=(700, 500))
-# win.addsaveimage(tmpgraph)
-# txt = "" % tmpgraph
-# win.HtmlPage.SetPage(txt)
-# win.Show(True)