X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=listlex.py;h=dea3c98d5bbe07974c988c6a2b136e986d8dc8bb;hp=ef363729388b68c9eddfd16a61d290194534a7f1;hb=3647a911117ea08f4f969720a16c58bcc7d4e809;hpb=db5a9978f585f997ec3c714e66b5b554b0783986
diff --git a/listlex.py b/listlex.py
index ef36372..dea3c98 100644
--- a/listlex.py
+++ b/listlex.py
@@ -26,7 +26,7 @@ from operator import itemgetter
#---------------------------------------------------------------------------
class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin):
- def __init__(self, parent,gparent, dlist = {}, first = [], menu = True):
+ 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
@@ -34,7 +34,7 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
self.dlist=dlist
self.first = first
self.tgen = False
- if 'etoiles' in dir(self.gparent) :
+ if 'etoiles' in dir(self.gparent) and not usefirst :
self.etoiles = self.gparent.etoiles
else :
self.etoiles = []
@@ -248,15 +248,10 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
parametres = page.parametres
paneff = self.gparent.ListPanEff
panchi = self.gparent.ListPan
- #etoiles = self.gparent.etoiles
et = self.etoiles[ind]
-
- #if et.startswith(u'X.') :
- # et = et.replace(u'X.', u'*')
uces = corpus.getucesfrometoile(et)
self.la = [panchi.dlist[i][0] for i in range(0, len(panchi.dlist)) if panchi.dlist[i][ind+1] >= minind ]
self.lchi = [panchi.dlist[i][ind+1] for i in range(0, len(panchi.dlist)) if panchi.dlist[i][ind+1] >= minind ]
- #lfreq = [paneff.dlist[i][ind+1] for i in range(0, len(panchi.dlist)) if panchi.dlist[i][ind+1] >= minind ]
if max(self.lchi) == float('inf') :
nchi = []
for val in self.lchi :
@@ -278,8 +273,6 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
ucis_txt, ucestxt = doconcorde(corpus, nuces, self.la)
items = dict([[i, '
'.join([ucis_txt[i], '
' % ntab2[i][0], ucestxt[i]])] for i in range(0,len(ucestxt))])
win = message(self, items, u"Segments de texte caractéristiques - %s" % self.first[ind], (900, 600))
- #win.html = '\n' + '
'.join(['
'.join([ucis_txt[i], '' % ntab2[i][0], ucestxt[i]]) for i in range(0,len(ucestxt))]) + '\n'
- #win.HtmlPage.SetPage(win.html)
win.Show(True)
def OnPopupTwo(self, event):
@@ -289,15 +282,17 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
corpus = page.corpus
else :
corpus = self.parent.parent.parent.corpus
- item=self.getColumnText(self.GetFirstSelected(), 0)
- uce_ok = corpus.getlemuces(item)
ira = wx.GetApp().GetTopWindow()
- ucis_txt, ucestxt = doconcorde(corpus, uce_ok, [item])
+ item=self.getColumnText(self.GetFirstSelected(), 0)
+ if not self.tgen :
+ uce_ok = corpus.getlemuces(item)
+ wordlist = [item]
+ else :
+ uce_ok = corpus.gettgenst(self.tgens[item])
+ wordlist = [val for val in self.tgens[item] if val in corpus.lems]
+ ucis_txt, ucestxt = doconcorde(corpus, uce_ok, wordlist)
items = dict([[i, '
'.join([ucis_txt[i], ucestxt[i]])] for i in range(0,len(ucestxt))])
- win = message(ira, items, u"Concordancier - %s" % item, (800, 500))
- #win = message(ira, u"Concordancier", (800, 500))
- #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 = message(ira, items, u"Concordancier - %s" % item, (800, 500), uceids = uce_ok)
win.Show(True)
def getinf(self, txt) :