textometrieR

[iramuteq] / ProfList.py

diff --git a/ProfList.py b/ProfList.py
index 0e3fab7..cca1423 100644 (file)
--- a/ProfList.py
+++ b/ProfList.py
@@ -663,14 +663,19 @@ class ProfListctrlPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Col
         tableout = [vchistable[fchistable.index(word)] for word in words]
         tmpgraph = tempfile.mktemp(dir=self.Source.parent.TEMPDIR)
         nbcl = len(title)
+        nbwords = len(words)
         txt = barplot(tableout, words, title, self.Source.parent.RscriptsPath['Rgraph'], tmpgraph)
         tmpscript = tempfile.mktemp(dir=self.Source.parent.TEMPDIR)
         file = open(tmpscript,'w')
         file.write(txt)
         file.close()
-        
         exec_rcode(self.Source.parent.RPath, tmpscript, wait = True)
-        win = MessageImage(self, u"Graphique", size=(700, 500))
+        w = 100 + (20 * nbwords) + (100 * nbcl)
+        h = 100 + (nbwords * 15)
+        if w > 1100 : w = 1100
+        if h > 800 : h = 800
+        if h < 450 : h = 450
+        win = MessageImage(self, u"Graphique", size=(w, h))
         win.addsaveimage(tmpgraph)
         txt = "<img src='%s'>" % tmpgraph
         win.HtmlPage.SetPage(txt)
@@ -1594,8 +1599,6 @@ class message(wx.Dialog):
                
         self.SetSizeHintsSz( wx.DefaultSize, wx.DefaultSize )
 
-        #kwds["style"] = wx.DEFAULT_FRAME_STYLE
-        #wx.Frame.__init__(self, *args, **kwds)
         self.html = ""
         self.HtmlPage=wx.html.HtmlWindow(self, -1)
         self.HtmlPage.SetMinSize( size )
@@ -1612,18 +1615,13 @@ class message(wx.Dialog):
         self.__do_layout()
 
     def __do_layout(self):
-        #sizer_1 = wx.BoxSizer(wx.VERTICAL)
         sizer_2 = wx.BoxSizer(wx.VERTICAL)
         sizer_2.Add(self.HtmlPage, 0, wx.EXPAND|wx.ADJUST_MINSIZE, 0)
         m_sdbSizer1 = wx.StdDialogButtonSizer()
         m_sdbSizer1.AddButton(  self.button_1 )
         m_sdbSizer1.AddButton(  self.button_2 )
         m_sdbSizer1.Realize()
-        #sizer_2.Add(self.button_1, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 0)
-        #sizer_2.Add(self.button_2, 0, wx.ALIGN_CENTER_HORIZONTAL|wx.ADJUST_MINSIZE, 0)
-        #sizer_1.Add(sizer_2, 1, wx.EXPAND, 0)
         sizer_2.Add(m_sdbSizer1, 1, wx.EXPAND, 5)
-        #self.SetAutoLayout(True)
         self.SetSizer(sizer_2)
         self.Layout()
         sizer_2.Fit( self )
@@ -1645,36 +1643,3 @@ class message(wx.Dialog):
 
     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\x00<IDAT8\x8dcddbf\xa0\x040Q\xa4{h\x18\xf0\xff\xdf\xdf\xffd\x1b\x00\xd3\
-#\x8c\xcf\x10\x9c\x06\xa0k\xc2e\x08m\xc2\x00\x97m\xd8\xc41\x0c \x14h\xe8\xf2\
-#\x8c\xa3)q\x10\x18\x00\x00R\xd8#\xec\xb2\xcd\xc1Y\x00\x00\x00\x00IEND\xaeB`\
-#\x82' 
-#
-#def getSmallUpArrowBitmap():
-#    return wx.BitmapFromImage(getSmallUpArrowImage())
-#
-#def getSmallUpArrowImage():
-#    stream = cStringIO.StringIO(getSmallUpArrowData())
-#    return wx.ImageFromStream(stream)
-#
-##----------------------------------------------------------------------
-#def getSmallDnArrowData():
-#    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\x00HIDAT8\x8dcddbf\xa0\x040Q\xa4{\xd4\x00\x06\x06\x06\x06\x06\x16t\x81\
-#\xff\xff\xfe\xfe'\xa4\x89\x91\x89\x99\x11\xa7\x0b\x90%\ti\xc6j\x00>C\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)