X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;ds=inline;f=listlex.py;h=ef363729388b68c9eddfd16a61d290194534a7f1;hb=8da2396093541e59ff1f5ae3ca43aee8e5e310d3;hp=7664614cfb98dc20a3e0dcec14394015007bd31b;hpb=6919f2ef8d85c176c7be824b606c4b71142e10fd;p=iramuteq
diff --git a/listlex.py b/listlex.py
index 7664614..ef36372 100644
--- a/listlex.py
+++ b/listlex.py
@@ -18,10 +18,10 @@ import wx
import wx.lib.mixins.listctrl as listmix
import cStringIO
import tempfile
-from functions import exec_rcode, MessageImage, doconcorde
+from functions import exec_rcode, doconcorde
from chemins import ffr
from PrintRScript import barplot
-from dialog import SearchDial, message
+from dialog import SearchDial, message, BarGraphDialog, MessageImage, BarFrame
from operator import itemgetter
#---------------------------------------------------------------------------
@@ -42,7 +42,6 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
if val.startswith(u'X.') :
val = val.replace(u'X.', u'*')
self.etoiles.append(val)
-
self.menu = menu
#def start(self) :
@@ -69,7 +68,7 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
self.selected = {}
i=0
- for name in [u'formes'] + self.first :
+ for name in [u'formes'] + self.etoiles :
self.InsertColumn(i,name,wx.LIST_FORMAT_LEFT)
i+=1
@@ -208,7 +207,8 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
self.Bind(wx.EVT_MENU, self.onstcaract, id = nid)
menu.AppendMenu(-1, u"Segments de texte caractéristiques", menu_stcaract)
#menu.Append(self.popup_Tgen_glob, "Tgen global")
- menu.Append(self.onmaketgen, "Make Tgen")
+ if not self.tgen :
+ menu.Append(self.onmaketgen, "Make Tgen")
self.PopupMenu(menu)
menu.Destroy()
@@ -230,9 +230,11 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
for forme in lems[word].formes :
rep.append([corpus.getforme(forme).forme, corpus.getforme(forme).freq])
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)
+ items = dict([[i, '' + '\t:\t'.join([str(val) for val in forme]) + ''] for i, forme in enumerate(rep)])
+ win = message(self, items, u"Formes associées", (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) :
@@ -313,20 +315,10 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
last = self.GetNextSelected(last)
data = self.GetItemData(last)
datas += [data]
- colnames = self.etoiles
+ colnames = self.first
table = [[self.getinf(val) for val in line[1:]] for line in datas]
rownames = [val[0] for val in datas]
- tmpgraph = tempfile.mktemp(dir=self.parent.TEMPDIR)
- txt = barplot(table, rownames, colnames, self.parent.RscriptsPath['Rgraph'], tmpgraph)
- tmpscript = tempfile.mktemp(dir=self.parent.TEMPDIR)
- with open(tmpscript,'w') as f :
- f.write(txt)
- exec_rcode(self.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)
+ BarFrame(self.parent, table, colnames, rownames)
def OnTgen_glob(self, evt) :
activenotebook = self.parent.nb.GetSelection()