X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;ds=inline;f=listlex.py;h=a70b9889b56d0727de6dd3c97582580c14267bfd;hb=c11976803674091bd4e7ed4cbadeeebb5be67325;hp=cdae6e9a041fd022ad600515cfaeaa6127acb38d;hpb=1a995a6ca4e8dbb09c8b9ab1276dabf17e065f0d;p=iramuteq
diff --git a/listlex.py b/listlex.py
index cdae6e9..a70b988 100644
--- a/listlex.py
+++ b/listlex.py
@@ -21,22 +21,18 @@ import tempfile
from functions import exec_rcode, MessageImage
from chemins import ffr
from PrintRScript import barplot
-from dialog import SearchDial
+from dialog import SearchDial, message
+from operator import itemgetter
#---------------------------------------------------------------------------
-#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 ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin):
- def __init__(self, parent,gparent, dlist,first):
+ def __init__(self, parent,gparent, dlist, first, menu = True):
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.menu = menu
search_id = wx.NewId()
self.parent.Bind(wx.EVT_MENU, self.onsearch, id = search_id)
@@ -67,7 +63,7 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
self.SetColumnWidth(0, 180)
for i in range(1,len(first)-1):
- self.SetColumnWidth(i, len(first[i]) * 10)
+ self.SetColumnWidth(i, self.checkcolumnwidth(len(first[i]) * 10))
self.itemDataMap = dlist
self.itemIndexMap = dlist.keys()
@@ -88,6 +84,12 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
#-----------------------------------------------------------------------------------------
+ def checkcolumnwidth(self, width) :
+ if width < 80 :
+ return 80
+ else :
+ return width
+
def OnGetItemText(self, item, col):
index=self.itemIndexMap[item]
s = self.itemDataMap[index][col]
@@ -141,35 +143,35 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
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):
-
- # only do this part the first time so the events are only bound once
- if not hasattr(self, "popupID1"):
- self.popupID1 = wx.NewId()
- self.popupID2 = wx.NewId()
- self.popupID3 = wx.NewId()
- self.popup_Tgen_glob = 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)
- # 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.popupID3, "Graphique")
- #menu.Append(self.popup_Tgen_glob, "Tgen global")
-
- self.PopupMenu(menu)
- menu.Destroy()
+ if self.menu :
+ # only do this part the first time so the events are only bound once
+ if not hasattr(self, "popupID1"):
+ self.popupID1 = wx.NewId()
+ self.popupID2 = wx.NewId()
+ self.popupID3 = wx.NewId()
+ self.popup_Tgen_glob = 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)
+ # 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.popupID3, "Graphique")
+ #menu.Append(self.popup_Tgen_glob, "Tgen global")
+
+ self.PopupMenu(menu)
+ menu.Destroy()
def getselectedwords(self) :
- words = [self.getColumnText(self.GetFirstSelected(), 6)]
+ words = [self.getColumnText(self.GetFirstSelected(), 0)]
last = self.GetFirstSelected()
while self.GetNextSelected(last) != -1:
last = self.GetNextSelected(last)
@@ -185,7 +187,8 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
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)
+ rep.sort(key = itemgetter(1), reverse = True)
+ 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)
@@ -195,7 +198,7 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
page = self.parent.nb.GetPage(activenotebook)
item=self.getColumnText(self.GetFirstSelected(), 0)
corpus = page.corpus
- win = message(self, -1, u"Concordancier", size=(600, 200),style = wx.DEFAULT_FRAME_STYLE)
+ win = message(self, u"Concordancier", (750, 600))
avap=60
listmot = corpus.getlems()[item].formes
uce_ok = corpus.getlemuces(item)
@@ -274,41 +277,3 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
txt = "" % tmpgraph
win.HtmlPage.SetPage(txt)
win.Show(True)
-
-
-
-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()