X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=search_list.py;h=d155200d6e3eec57ca5eb94258b586c4e7683009;hp=dab8f83e9f1813d3df02c2bf70c63dd3af33a8e5;hb=148fe710bf14981c45e865e8b4ddb68333e62f7c;hpb=25061ca972d5be7a8ef3aa42276accc3761a3364 diff --git a/search_list.py b/search_list.py index dab8f83..d155200 100644 --- a/search_list.py +++ b/search_list.py @@ -18,18 +18,11 @@ import wx import wx.lib.mixins.listctrl as listmix import cStringIO import tempfile -from functions import exec_rcode, MessageImage -from dialog import message +from functions import exec_rcode +from dialog import message, BarFrame from chemins import ffr -from PrintRScript import barplot, dendroandbarplot #--------------------------------------------------------------------------- -#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 SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin): #wx.Panel, listmix.ColumnSorterMixin): def __init__(self, parent,gparent, dlist,first, nbactives, nbetoiles, add_dendro=True): wx.ListCtrl.__init__( self, parent, -1, style=wx.LC_REPORT|wx.LC_VIRTUAL|wx.LC_HRULES|wx.LC_VRULES) @@ -203,7 +196,7 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort lems = corpus.lems rep = [] for forme in lems[word] : - rep.append([forme, corpus.formes[forme][0]]) + rep.append([forme, corpus.formes[forme][0]]) win = message(self, u"Formes associées", size=(300, 200)) win.html = '\n' + '
'.join([' : '.join([str(val) for val in forme]) for forme in rep]) + '\n' win.HtmlPage.SetPage(win.html) @@ -271,17 +264,7 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort colnames = self.first[2:] rownames = [val[1] for val in datas] table = [[str(val) for val in line[2:]] for line in datas] - tmpgraph = tempfile.mktemp(dir=self.parent.parent.TEMPDIR) - txt = barplot(table, rownames, colnames, self.parent.parent.RscriptsPath['Rgraph'], tmpgraph) - tmpscript = tempfile.mktemp(dir=self.parent.parent.TEMPDIR) - with open(tmpscript,'w') as f : - f.write(txt) - exec_rcode(self.parent.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.parent, table, colnames, rownames) def ongraphdendro(self, evt) : corpus = self.parent.corpus @@ -295,82 +278,4 @@ class SearchList(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSort rownames = [val[1] for val in datas] table = [[str(val) for val in line[2:]] for line in datas] tmpgraph = tempfile.mktemp(dir=self.parent.parent.TEMPDIR) - txt = dendroandbarplot(table, rownames, colnames, self.parent.parent.RscriptsPath['Rgraph'], tmpgraph, dendro=corpus.dictpathout['Rdendro']) - tmpscript = tempfile.mktemp(dir=self.parent.parent.TEMPDIR) - with open(tmpscript,'w') as f : - f.write(txt) - exec_rcode(self.parent.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) - -#class message(wx.Dialog): -# def __init__(self, *args, **kwds): -# # begin wxGlade: MyFrame.__init__ -# kwds["style"] = wx.DEFAULT_FRAME_STYLE -# wx.Frame.__init__(self, *args, **kwds) -# 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() -# -# -#def getSmallUpArrowData(): -# return \ -#'\x89PNG\r\n\x1a\n\x00\x00\x00\rIHDR\x00\x00\x00\x10\x00\x00\x00\x10\x08\x06\ -#\x00\x00\x00\x1f\xf3\xffa\x00\x00\x00\x04sBIT\x08\x08\x08\x08|\x08d\x88\x00\ -#\x00\x00C\xb0\x89\ -#\xd3.\x10\xd1m\xc3\xe5*\xbc.\x80i\xc2\x17.\x8c\xa3y\x81\x01\x00\xa1\x0e\x04e\ -#?\x84B\xef\x00\x00\x00\x00IEND\xaeB`\x82" -# -#def getSmallDnArrowBitmap(): -# return wx.BitmapFromImage(getSmallDnArrowImage()) -# -#def getSmallDnArrowImage(): -# stream = cStringIO.StringIO(getSmallDnArrowData()) -# return wx.ImageFromStream(stream) + BarFrame(self.parent.parent, table, colnames, rownames, tree = corpus.dictpathout['Rdendro'])