X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=listlex.py;h=75607f330bb3dbf5d9f2674a91867d92f4645e35;hp=5d34a66b9afa356ba2f20f7a21741777ba65b14c;hb=3d64c267454b7f21a33b58af45459d1f66d43241;hpb=a503f041dc4947ee21c1d353ddd05ddb13a5e322

diff --git a/listlex.py b/listlex.py
index 5d34a66..75607f3 100644
--- a/listlex.py
+++ b/listlex.py
@@ -59,35 +59,41 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
         
         self.dlist = dlist 
 
-        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, self)
-        
-        # for wxMSW
-        self.Bind(wx.EVT_COMMAND_RIGHT_CLICK, self.OnRightClick)
+        i=0
+        for name in first :
+            self.InsertColumn(i,name,wx.LIST_FORMAT_LEFT)
+            i+=1
+            
+        self.SetColumnWidth(0, 180)
 
-        # for wxGTK
-        self.Bind(wx.EVT_RIGHT_UP, self.OnRightClick)
-        
+        for i in range(1,len(first)-1):
+            self.SetColumnWidth(i, self.checkcolumnwidth(len(first[i]) * 10))
         
         self.itemDataMap = dlist
         self.itemIndexMap = dlist.keys()
         self.SetItemCount(len(dlist))
         
-        listmix.ListCtrlAutoWidthMixin.__init__(self)
+        #listmix.ListCtrlAutoWidthMixin.__init__(self)
         listmix.ColumnSorterMixin.__init__(self, len(first))
-        self.SortListItems(1, False)
+        self.SortListItems(1, 0)
         
 #-----------------------------------------------------------------------------------------    
+        self.Bind(wx.EVT_LIST_ITEM_SELECTED, self.OnItemSelected, self)
+        
+        # for wxMSW
+        self.Bind(wx.EVT_COMMAND_RIGHT_CLICK, self.OnRightClick)
 
-        i=0
-        for name in first :
-            self.InsertColumn(i,name,wx.LIST_FORMAT_LEFT)
-            i+=1
-            
-        self.SetColumnWidth(0, 180)
+        # for wxGTK
+        self.Bind(wx.EVT_RIGHT_UP, self.OnRightClick)
 
-        for i in range(1,len(first)-1):
-            self.SetColumnWidth(i, len(first[i]) * 10)
+#-----------------------------------------------------------------------------------------    
         
+    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]
@@ -107,8 +113,7 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
     # Used by the ColumnSorterMixin, see wx/lib/mixins/listctrl.py
     def GetSortImages(self):
         return (self.sm_dn, self.sm_up)
-
-
+    
     def OnRightDown(self, event):
         x = event.GetX()
         y = event.GetY()
@@ -127,7 +132,14 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
         index=self.itemIndexMap[item]
         s = self.itemDataMap[index]
         return s
-
+    
+    def SortItems(self,sorter=cmp):
+        items = list(self.itemDataMap.keys())
+        items.sort(sorter)
+        self.itemIndexMap = items
+        # redraw the list
+        self.Refresh()
+    
     def OnItemSelected(self, event):
         self.currentItem = event.m_itemIndex
         event.Skip()
@@ -162,12 +174,19 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
         self.PopupMenu(menu)
         menu.Destroy()
 
+    def getselectedwords(self) :
+        words = [self.getColumnText(self.GetFirstSelected(), 0)]
+        last = self.GetFirstSelected()
+        while self.GetNextSelected(last) != -1:
+            last = self.GetNextSelected(last)
+            words.append(self.getColumnText(last, 1))
+        return words
 
     def OnPopupOne(self, event):
         activenotebook = self.parent.nb.GetSelection()
         page = self.parent.nb.GetPage(activenotebook)
         corpus = page.corpus
-        word = self.getColumnText(self.GetFirstSelected(), 0)
+        word = self.getselectedwords()[0]
         lems = corpus.getlems()
         rep = []
         for forme in lems[word].formes :
@@ -198,28 +217,31 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
         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) :
-        print 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:]
-        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)
-
         txt = barplot(table, rownames, colnames, self.parent.RscriptsPath['Rgraph'], tmpgraph)
-
         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)
-        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)
@@ -259,12 +281,7 @@ class ListForSpec(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSor
         win.HtmlPage.SetPage(txt)
         win.Show(True)
 
-    def SortItems(self,sorter=cmp):
-        items = list(self.itemDataMap.keys())
-        items.sort(sorter)
-        self.itemIndexMap = items
-        # redraw the list
-        self.Refresh()
+
 
 class message(wx.Frame):
     def __init__(self, *args, **kwds):