X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;f=ProfList.py;h=f564d6099172310d1f434a71a0e276941cf94426;hb=b1508377fa575a61f1127273d328766608237014;hp=b64d633e6916079a3bfac3fc92aad90f91500b70;hpb=ff602f724b8fc80f4fa067dbbc830343c0b4bed4;p=iramuteq
diff --git a/ProfList.py b/ProfList.py
index b64d633..f564d60 100644
--- a/ProfList.py
+++ b/ProfList.py
@@ -134,7 +134,7 @@ class ProfListctrlPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Col
#events
#self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected)
- #self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnItemActivated)
+ self.Bind(wx.EVT_LIST_ITEM_ACTIVATED, self.OnPopupTwo, self)
#self.Bind(wx.EVT_LIST_ITEM_DESELECTED, self.OnItemDeselected)
self.Bind(wx.EVT_LIST_COL_CLICK, self.OnColClick)
@@ -147,6 +147,7 @@ class ProfListctrlPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Col
#for searching
search_id = wx.NewId()
searchall_id = wx.NewId()
+ concord_id = wx.NewId()
self.parent.Bind(wx.EVT_MENU, self.onsearch, id = search_id)
self.parent.Bind(wx.EVT_MENU, self.onsearchall, id = searchall_id)
self.accel_tbl = wx.AcceleratorTable([(wx.ACCEL_CTRL, ord('F'), search_id),
@@ -367,7 +368,11 @@ class ProfListctrlPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Col
def onexport(self, evt) :
if 'corpus' in dir(self.Source):
corpus = self.Source.corpus
- corpus.export_classe(self.Source.pathout['classe_%i_export.txt' % self.cl], self.cl)
+ if self.Source.parametres['classif_mode'] != 2 :
+ uci = False
+ else :
+ uci = True
+ corpus.export_classe(self.Source.pathout['classe_%i_export.txt' % self.cl], self.cl, uci = uci)
dial = wx.MessageDialog(self, self.Source.pathout['classe_%i_export.txt' % self.cl], u"Export", wx.OK|wx.ICON_INFORMATION)
dial.ShowModal()
dial.Destroy()
@@ -517,10 +522,14 @@ class ProfListctrlPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Col
dlg = progressbar(self, 2)
corpus = self.Source.corpus
uces = corpus.lc[self.cl-1]
+ if self.Source.parametres['classif_mode'] != 2 :
+ uci = False
+ else :
+ uci = True
l = []
dlg.Update(1, u'Segments...')
for i in range(2,10) :
- li = corpus.find_segments_in_classe(uces, i, 1000)
+ li = corpus.find_segments_in_classe(uces, i, 1000, uci = uci)
if li == [] :
break
else :
@@ -545,7 +554,11 @@ class ProfListctrlPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Col
dlg = progressbar(self,maxi = 4)
corpus = self.Source.corpus
uces = corpus.lc[self.cl-1]
- tab = corpus.make_table_with_classe(uces, self.la)
+ if self.Source.parametres['classif_mode'] != 2 :
+ uci = False
+ else :
+ uci = True
+ tab = corpus.make_table_with_classe(uces, self.la, uci = uci)
tab.pop(0)
dlg.Update(2, u'score...')
if atype == 0 :
@@ -558,7 +571,7 @@ class ProfListctrlPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Col
ntab2 = ntab2[:limite]
nuces = [val[1] for val in ntab2]
dlg.Update(3, u'concordancier...')
- ucis_txt, ucestxt = doconcorde(corpus, nuces, self.la)
+ ucis_txt, ucestxt = doconcorde(corpus, nuces, self.la, uci = uci)
dlg.Update(4, u'texte...')
win = message(self, u"Segments de texte caractéristiques - Classe %i" % self.cl, (750, 600))
win.html = '\n' + '
'.join(['
'.join([ucis_txt[i], '
score : %.2f |