X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;f=listlex.py;h=3a11826cf412c37b9e5329fdeb46d8b848895d3f;hb=efbde1a5121320cbd1966531ac9b5d23df4c9e90;hp=555b5f3f462a93a4fc5566c9ce78b7cabb55a503;hpb=cf9a653bae1978c03905a2d7984bbc7403bf0d68;p=iramuteq
diff --git a/listlex.py b/listlex.py
index 555b5f3..3a11826 100644
--- a/listlex.py
+++ b/listlex.py
@@ -1,9 +1,10 @@
# -*- 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:
# Author: Robin Dunn & Gary Dumer
#
@@ -12,52 +13,63 @@
# Licence: wxWindows license
#----------------------------------------------------------------------------
+#------------------------------------
+# import des modules python
+#------------------------------------
import os
import sys
-import wx
-import wx.lib.mixins.listctrl as listmix
import tempfile
+from operator import itemgetter
+
+import langue
+langue.run()
+
+#------------------------------------
+# import des modules wx
+#------------------------------------
+import wx
+import wx.lib.mixins.listctrl as listmix
+
+#------------------------------------
+# import des fichiers du projet
+#------------------------------------
from functions import exec_rcode, doconcorde
from chemins import ffr
from PrintRScript import barplot
from dialog import SearchDial, message, BarGraphDialog, BarFrame
-from operator import itemgetter
-#---------------------------------------------------------------------------
+
class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin):
+
def __init__(self, parent,gparent, dlist = {}, first = [], usefirst = False, menu = True):
- #def __init__(self, parent) :
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.dlist=dlist
self.first = first
self.tgen = False
+ self.tgenlem = False
if 'etoiles' in dir(self.gparent) and not usefirst :
self.etoiles = self.gparent.etoiles
else :
self.etoiles = []
for val in self.first :
- if val.startswith(u'X.') :
- val = val.replace(u'X.', u'*')
+ if val.startswith('X.') :
+ val = val.replace('X.', '*')
self.etoiles.append(val)
self.menu = menu
-
- #def start(self) :
+ #def start(self) :
search_id = wx.NewId()
self.parent.Bind(wx.EVT_MENU, self.onsearch, id = search_id)
self.accel_tbl = wx.AcceleratorTable([(wx.ACCEL_CTRL, ord('F'), search_id)])
self.SetAcceleratorTable(self.accel_tbl)
-
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)
-
tID = wx.NewId()
-
self.attr1 = wx.ListItemAttr()
self.attr1.SetBackgroundColour((230, 230, 230))
self.attr2 = wx.ListItemAttr()
@@ -65,42 +77,39 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
self.attrselected = wx.ListItemAttr()
self.attrselected.SetBackgroundColour("red")
self.selected = {}
-
i=0
- for name in [u'formes'] + self.etoiles :
+ for name in ['formes'] + self.etoiles :
self.InsertColumn(i,name,wx.LIST_FORMAT_LEFT)
i+=1
-
self.SetColumnWidth(0, 180)
-
for i in range(0,len(self.etoiles)):
self.SetColumnWidth(i + 1, self.checkcolumnwidth(len(self.etoiles[i]) * 10))
-
self.itemDataMap = self.dlist
- self.itemIndexMap = self.dlist.keys()
+ self.itemIndexMap = list(self.dlist.keys())
self.SetItemCount(len(self.dlist))
-
- #listmix.ListCtrlAutoWidthMixin.__init__(self)
listmix.ColumnSorterMixin.__init__(self, len(self.first) + 1)
- self.SortListItems(1, 0)
-
-#-----------------------------------------------------------------------------------------
+ self.SortListItems(1, False)
+ #-----------------------------------------------------------------------------------------
self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, self)
-
self.Bind(wx.EVT_LIST_ITEM_ACTIVATED , self.OnPopupTwo, self)
# for wxMSW
self.Bind(wx.EVT_COMMAND_RIGHT_CLICK, self.OnRightClick)
-
# for wxGTK
self.Bind(wx.EVT_RIGHT_UP, self.OnRightClick)
-
#-----------------------------------------------------------------------------------------
+
+ def OnGetItemColumnImage(self, item, col):
+ return -1
+
+ def OnGetItemImage(self, item):
+ pass
+
def RefreshData(self, data):
self.itemDataMap = data
- self.itemIndexMap = data.keys()
+ self.itemIndexMap = list(data.keys())
self.SetItemCount(len(data))
self.Refresh()
-
+
def checkcolumnwidth(self, width) :
if width < 80 :
return 80
@@ -110,17 +119,21 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
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 #modification pour python 3
def OnGetItemAttr(self, item):
- if self.getColumnText(item, 0) not in self.selected :
+ index=self.itemIndexMap[item]
+ if self.IsSelected(index) == False :
if item % 2 :
return self.attr1
else :
return self.attr2
else :
return self.attrselected
-
+
def GetItemByWord(self, word):
return [ val for val in self.dlist if self.dlist[val][0] == word ][0]
@@ -136,15 +149,13 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
x = event.GetX()
y = event.GetY()
item, flags = self.HitTest((x, y))
-
if flags & wx.LIST_HITTEST_ONITEM:
self.Select(item)
-
event.Skip()
-
+
def GetString(self, evt):
return self.getselectedwords()[0]
-
+
def GetSelections(self):
return self.getselectedwords()
@@ -157,15 +168,17 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
s = self.itemDataMap[index]
return s
- 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): # modification pour python 3
+ 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 OnItemSelected(self, event):
- self.currentItem = event.m_itemIndex
+ self.currentItem = event.GetIndex() #event.m_itemIndex
event.Skip()
def onsearch(self, evt) :
@@ -184,19 +197,21 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
self.popup_Tgen_glob = wx.NewId()
self.onmaketgen = wx.NewId()
self.ID_stcaract = wx.NewId()
-
- 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)
- self.Bind(wx.EVT_MENU, self.OnTgen_glob, id=self.popup_Tgen_glob)
- self.Bind(wx.EVT_MENU, self.OnMakeTgen, id=self.onmaketgen)
+ self.id_tgendetails = wx.NewId()
+ # on attache les événements aux éléments
+ 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)
+ self.Bind(wx.EVT_MENU, self.OnTgen_glob, id = self.popup_Tgen_glob)
+ self.Bind(wx.EVT_MENU, self.OnMakeTgen, id = self.onmaketgen)
+ self.Bind(wx.EVT_MENU, self.OnTgenDetails, id = self.id_tgendetails)
#self.Bind(wx.EVT_MENU, self.onstcaract, id = self.ID_stcaract)
# make a menu
menu = wx.Menu()
# add some items
- menu.Append(self.popupID1, _(u"Associated forms").decode('utf8'))
- menu.Append(self.popupID2, _(u"Concordance").decode('utf8'))
- menu.Append(self.popupID3, _(u"Graphic").decode('utf8'))
+ menu.Append(self.popupID1, _("Associated forms"))
+ menu.Append(self.popupID2, _("Concordance"))
+ menu.Append(self.popupID3, _("Graphic"))
menu_stcaract = wx.Menu()
self.menuid = {}
if not self.tgen :
@@ -205,8 +220,10 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
self.menuid[nid] = i
menu_stcaract.Append(nid, et)
self.Bind(wx.EVT_MENU, self.onstcaract, id = nid)
- menu.AppendMenu(-1, _(u"Typical text segments").decode('utf8'), menu_stcaract)
- menu.Append(self.onmaketgen, _(u"Make Tgen").decode('utf8'))
+ menu.Append(-1, _("Typical text segments"), menu_stcaract) #modifié
+ menu.Append(self.onmaketgen, _("Make Tgen"))
+ else :
+ menu.Append(self.id_tgendetails, _('Tgen details'))
self.PopupMenu(menu)
menu.Destroy()
@@ -229,12 +246,12 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
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 = message(self, items, _("Associated forms"), (300, 200))
#win = message(self, u"Formes associées", (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 onstcaract(self, evt) :
ind = self.menuid[evt.Id]
limite = 50
@@ -270,7 +287,7 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
nuces = [val[1] for val in ntab2]
ucis_txt, ucestxt = doconcorde(corpus, nuces, self.la)
items = dict([[i, '
'.join([ucis_txt[i], '
score : %.2f |