...

[iramuteq] / listlex.py

diff --git a/listlex.py b/listlex.py
index 4b417e3..75607f3 100644 (file)
--- a/listlex.py
+++ b/listlex.py
@@ -67,7 +67,7 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
         self.SetColumnWidth(0, 180)
 
         for i in range(1,len(first)-1):
         self.SetColumnWidth(0, 180)
 
         for i in range(1,len(first)-1):

-            self.SetColumnWidth(i, len(first[i]) * 10)
+            self.SetColumnWidth(i, self.checkcolumnwidth(len(first[i]) * 10))

         
         self.itemDataMap = dlist
         self.itemIndexMap = dlist.keys()
         
         self.itemDataMap = dlist
         self.itemIndexMap = dlist.keys()


@@ -88,6 +88,12 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
 
 #-----------------------------------------------------------------------------------------    
         
 
 #-----------------------------------------------------------------------------------------    
         

+    def checkcolumnwidth(self, width) :
+        if width < 80 :
+            return 80
+        else :
+            return width
+

     def OnGetItemText(self, item, col):
         index=self.itemIndexMap[item]
         s = self.itemDataMap[index][col]
     def OnGetItemText(self, item, col):
         index=self.itemIndexMap[item]
         s = self.itemDataMap[index][col]


@@ -169,7 +175,7 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
         menu.Destroy()
 
     def getselectedwords(self) :
         menu.Destroy()
 
     def getselectedwords(self) :

-        words = [self.getColumnText(self.GetFirstSelected(), 6)]
+        words = [self.getColumnText(self.GetFirstSelected(), 0)]

         last = self.GetFirstSelected()
         while self.GetNextSelected(last) != -1:
             last = self.GetNextSelected(last)
         last = self.GetFirstSelected()
         while self.GetNextSelected(last) != -1:
             last = self.GetNextSelected(last)


@@ -211,28 +217,31 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
         win.HtmlPage.SetPage(txt)
         win.Show(True)
 
         win.HtmlPage.SetPage(txt)
         win.Show(True)
 

+    def getinf(self, txt) :
+        if txt == float('Inf') :
+            return 'Inf'
+        elif txt == float('-Inf') :
+            return '-Inf'
+        else :
+            return `txt`
+

     def OnPopupThree(self, event) :
     def OnPopupThree(self, event) :

-        print self.GetFirstSelected()

         datas = [self.GetItemData(self.GetFirstSelected())]
         datas = [self.GetItemData(self.GetFirstSelected())]

-        print datas

         last = self.GetFirstSelected()
         while self.GetNextSelected(last) != -1:
             last = self.GetNextSelected(last)
             data = self.GetItemData(last)
             datas += [data]
         colnames = self.first[1:]
         last = self.GetFirstSelected()
         while self.GetNextSelected(last) != -1:
             last = self.GetNextSelected(last)
             data = self.GetItemData(last)
             datas += [data]
         colnames = self.first[1:]

-        table = [[str(val) for val in line[1:]] for line in datas]
+        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)
         rownames = [val[0] for val in datas]
         tmpgraph = tempfile.mktemp(dir=self.parent.TEMPDIR)

-

         txt = barplot(table, rownames, colnames, self.parent.RscriptsPath['Rgraph'], tmpgraph)
         txt = barplot(table, rownames, colnames, self.parent.RscriptsPath['Rgraph'], tmpgraph)

-

         tmpscript = tempfile.mktemp(dir=self.parent.TEMPDIR)
         tmpscript = tempfile.mktemp(dir=self.parent.TEMPDIR)

-        file = open(tmpscript,'w')
-        file.write(txt)
-        file.close()
+        with open(tmpscript,'w') as f :
+            f.write(txt)

         exec_rcode(self.parent.RPath, tmpscript, wait = True)
         exec_rcode(self.parent.RPath, tmpscript, wait = True)

-        win = MessageImage(self, -1, u"Graphique", size=(700, 500),style = wx.DEFAULT_FRAME_STYLE)
+        win = MessageImage(self, u"Graphique", size=(700, 500))

         win.addsaveimage(tmpgraph)
         txt = "<img src='%s'>" % tmpgraph
         win.HtmlPage.SetPage(txt)
         win.addsaveimage(tmpgraph)
         txt = "<img src='%s'>" % tmpgraph
         win.HtmlPage.SetPage(txt)