corrections

diff --git a/corpus.py b/corpus.py
index 489d4f1..555a034 100644 (file)
--- a/corpus.py
+++ b/corpus.py
@@ -258,14 +258,14 @@ class Corpus :
 
     def getucisize(self) :
         ucesize = self.getucesize()
 
     def getucisize(self) :
         ucesize = self.getucesize()

-        return [sum(ucesize[uci.uces[0].ident:(uci.uces[-1].ident + 1)]) for uci in self.ucis]
+        return [sum(ucesize[uci.uces[0].ident:(uci.uces[-1].ident + 1)]) for uci in self.ucis if len(uci.uces) != 0]

 
     def getucesize(self) :
         res = self.getalluces()
         return [len(uce[1].split()) for uce in res]
 
     def getconcorde(self, uces) :
 
     def getucesize(self) :
         res = self.getalluces()
         return [len(uce[1].split()) for uce in res]
 
     def getconcorde(self, uces) :

-        return self.cuces.execute('select * from uces where id IN (%s) ORDER BY id;' % ', '.join([repr(i) for i in uces])) 
+        return self.cuces.execute('select * from uces where id IN (%s) ORDER BY id;' % ', '.join([repr(i) for i in uces]))

 
     def getuciconcorde(self, ucis) :
         uces = [[val,[uce.ident for uce in self.ucis[val].uces]] for val in ucis]
 
     def getuciconcorde(self, ucis) :
         uces = [[val,[uce.ident for uce in self.ucis[val].uces]] for val in ucis]


@@ -293,6 +293,11 @@ class Corpus :
     def getucesfrometoile(self, etoile) :
         return [uce.ident for uci in self.ucis for uce in uci.uces if etoile in uci.etoiles]
 
     def getucesfrometoile(self, etoile) :
         return [uce.ident for uci in self.ucis for uce in uci.uces if etoile in uci.etoiles]
 

+    def getucisfrometoile(self, etoile):
+        uces = [uce.ident for uci in self.ucis for uce in uci.uces if etoile in uci.etoiles]
+        return list(set([self.getucefromid(val).uci for val in uces]))
+
+

     def getetoileuces(self) :
         log.info('get uces etoiles')
         etoileuces = {}
     def getetoileuces(self) :
         log.info('get uces etoiles')
         etoileuces = {}


@@ -878,7 +883,7 @@ class Corpus :
             etoileuces = self.getetoileuces()
         else :
             etoileuces = self.getetoileucis()
             etoileuces = self.getetoileuces()
         else :
             etoileuces = self.getetoileucis()

-        etoileuces = dict([[et, etoileuces[et]] for et in etoileuces if len(etoileuces[et]) > 1])
+        etoileuces = dict([[et, etoileuces[et]] for et in etoileuces if len(etoileuces[et]) > 0])

         with open(fileout, 'w', encoding='utf8') as f :
             f.write('\n'.join([';'.join([et] + [repr(len(set(etoileuces[et]).intersection(classe))) for classe in ucecl]) for et in etoileuces])) #.encode(self.parametres['syscoding'])
         #etoiles = self.make_etoiles()
         with open(fileout, 'w', encoding='utf8') as f :
             f.write('\n'.join([';'.join([et] + [repr(len(set(etoileuces[et]).intersection(classe))) for classe in ucecl]) for et in etoileuces])) #.encode(self.parametres['syscoding'])
         #etoiles = self.make_etoiles()


@@ -1505,7 +1510,7 @@ class BuildSubCorpus(BuildCorpus):
                 newuces = []
                 newpara = []
                 for et in uci.paras :
                 newuces = []
                 newpara = []
                 for et in uci.paras :

-                    keepuces = [CopyUce(uce) for uce in uci.uces if uce.ident in dictucekeep]
+                    keepuces = [CopyUce(uce) for uce in uci.uces if uce.ident in dictucekeepand and uce.para == idpara]

                     idpara += 1
                     if keepuces != [] :
                         newuces += keepuces
                     idpara += 1
                     if keepuces != [] :
                         newuces += keepuces

diff --git a/elcategorizator.py b/elcategorizator.py
index 23dcfa4..c49a7ce 100644 (file)
--- a/elcategorizator.py
+++ b/elcategorizator.py
@@ -6,7 +6,7 @@
 import os
 import wx
 import wx.xrc
 import os
 import wx
 import wx.xrc

-#from wx.lib.splitter import MultiSplitterWindow
+from wx.lib.splitter import MultiSplitterWindow

 from listlex import *
 import pickle
 import json
 from listlex import *
 import pickle
 import json


@@ -156,6 +156,181 @@ class CategoDict :
 #cate = CategoDict()
 
 
 #cate = CategoDict()
 
 

+#class ElCategorizator ( wx.Panel ):
+#
+#    def __init__( self, parent, pathout, tableau, id = wx.ID_ANY, pos = wx.DefaultPosition, size = wx.Size( 500,300 ), style = wx.TAB_TRAVERSAL, name = wx.EmptyString ):
+#        wx.Panel.__init__ ( self, parent, id = id, pos = pos, size = size, style = style, name = name )
+#        self.pathout = pathout
+#        self.parent = parent
+#        self.tableau = tableau
+#
+#        self.cate = CategoDict(self.pathout)
+#        gsizer =  wx.BoxSizer( wx.VERTICAL )
+#
+#        bSizer1 = wx.BoxSizer( wx.HORIZONTAL )
+#
+#        self.m_listToCate = ListForWords(self, dlist = self.cate, first = ['eff'])
+#        bSizer1.Add( self.m_listToCate, 2, wx.ALL|wx.EXPAND, 5 )
+#
+#        self.m_listCate = ListForCate(self, dlist = self.cate, first = ['eff'])
+#        bSizer1.Add( self.m_listCate, 1, wx.ALL|wx.EXPAND, 5 )
+#
+#        self.m_listCateWords = ListForCateWords(self, dlist = self.cate, first = ['eff'])
+#        bSizer1.Add( self.m_listCateWords, 1, wx.ALL|wx.EXPAND, 5 )
+#
+#        bSizer2 = wx.BoxSizer( wx.HORIZONTAL )
+#
+#        self.butsave = wx.Button( self, wx.ID_SAVE, u"Save", wx.DefaultPosition, wx.DefaultSize, 0 )
+#        bSizer2.Add( self.butsave, 0, wx.ALL, 5 )
+#
+#        self.butcsv = wx.Button( self, wx.ID_ANY, u"Export Columns", wx.DefaultPosition, wx.DefaultSize, 0 )
+#        bSizer2.Add( self.butcsv, 0, wx.ALL, 5 )
+#
+#        self.butdict = wx.Button( self, wx.ID_ANY, u"Export dictonary", wx.DefaultPosition, wx.DefaultSize, 0 )
+#        bSizer2.Add( self.butdict, 0, wx.ALL, 5 )
+#
+#        self.butload = wx.Button( self, wx.ID_ANY, u"Load a categorization", wx.DefaultPosition, wx.DefaultSize, 0 )
+#        bSizer2.Add( self.butload, 0, wx.ALL, 5 )
+#
+#        self.butaddcate = wx.Button( self, wx.ID_ANY, u"Add a category", wx.DefaultPosition, wx.DefaultSize, 0 )
+#        bSizer2.Add( self.butaddcate, 0, wx.ALL, 5 )
+#
+#
+#        bSizer3 = wx.BoxSizer( wx.HORIZONTAL )
+#
+#        self.nbword = """Words : {:d} ({:d}) | """
+#
+#        self.stat = """ Words to categorize : {:d} ({}%) - {:d} ({}%) -- Categories : {:d} - {:d} ({}%) - {:d} ({}%)"""
+##        nbtocat, totocat, nbcate, totcate = self.cate.makestat()
+##        lenwords = self.cate.lenwords
+##        totwords = totocat + totcate
+##        prtocat = repr(nbtocat/lenwords)
+##        prtotocat = repr(totocat/totwords)
+##        prcate = repr(totcate/totwords)
+#        self.wordtxt = wx.StaticText(self, -1, "")
+#        bSizer3.Add( self.wordtxt, 0, wx.ALL, 5 )
+#        self.stattxt = wx.StaticText(self, -1, "")
+#        bSizer3.Add( self.stattxt, 0, wx.ALL, 5 )
+#
+#
+#        gsizer.Add( bSizer2, 0, wx.EXPAND, 5 )
+#        gsizer.Add( bSizer1, 2, wx.EXPAND, 5 )
+#        gsizer.Add( bSizer3, 0, wx.EXPAND, 5 )
+#
+#        self.butsave.Bind(wx.EVT_BUTTON, self.OnSave)
+#        self.butcsv.Bind(wx.EVT_BUTTON, self.OnCSV)
+#        self.butdict.Bind(wx.EVT_BUTTON, self.OnDict)
+#        self.butsave.SetBackgroundColour((14, 242, 14, 255))
+#        self.butload.Bind(wx.EVT_BUTTON, self.OnLoad)
+#        self.butaddcate.Bind(wx.EVT_BUTTON, self.OnAddCate)
+#        self.OnStat()
+#        self.SetSizer( gsizer )
+#        self.Layout()
+#
+#    def __del__( self ):
+#        pass
+#
+#
+#    def OnLoad(self, event) :
+#        if len(self.cate.cate['CATE']) != 0 :
+#            message = wx.MessageDialog(self, _("Categories must be empty to load a categorization."), _("Information"), wx.OK|wx.ICON_WARNING)
+#            message.ShowModal()
+#            message.Destroy()
+#            return
+#        wildcard = "json|*.json|" \
+#                   "All file|*.*"
+#        dlg = wx.FileDialog(
+#             self, message="Choose a file",
+#             defaultDir=self.pathout.dirout,
+#             defaultFile="",
+#             wildcard=wildcard,
+#             style=wx.FD_OPEN |
+#                   wx.FD_CHANGE_DIR | wx.FD_FILE_MUST_EXIST |
+#                   wx.FD_PREVIEW
+#             )
+#
+#        if dlg.ShowModal() == wx.ID_OK:
+#            paths = dlg.GetPaths()
+#            path = paths[0]
+#            self.cate.loadcate(path)
+#            self.m_listCate.RefreshData(self.cate.getcate())
+#            self.m_listToCate.RefreshData(self.cate.getwordstocate())
+#        dlg.Destroy()
+#
+#    def OnSave(self, event) :
+#        self.cate.save()
+#        self.butsave.SetBackgroundColour((14, 242, 14, 255))
+#
+#    def OnCSV(self, event) :
+#        wordscate = self.cate.getwordscate()
+#        newtab = [['category%i' % i for i in range(1, len(self.tableau.selected_col)+1)]]
+#        for line in self.tableau.select_col(self.tableau.selected_col):
+#            newline = []
+#            for word in line :
+#                newline.append(wordscate.get(word,word))
+#            newtab.append(newline)
+#        with open(self.pathout['tableout.csv'], 'w', encoding='utf8') as f :
+#            f.write('\n'.join(['\t'.join(line) for line in newtab]))
+#        message = wx.MessageDialog(self, _("Export successful\n%s" % self.pathout['tableout.csv']), _("Information"), wx.OK|wx.ICON_INFORMATION)
+#        message.ShowModal()
+#        message.Destroy()
+#
+#    def OnDict(self, event):
+#        with open(self.pathout['dictionnary.txt'], 'w', encoding='utf8') as f :
+#            for categorie in self.cate.cate['CATE'] :
+#                f.write(categorie + ': \t' + repr(self.cate.cate['CATE'][categorie][0]) + '\n')
+#                for word in self.cate.cate['CATE'][categorie][1] :
+#                    f.write('\t' + word + ': \t' + repr(self.cate.cate['CATE'][categorie][1][word]) + '\n')
+#            for word in self.cate.cate['TOCATE'] :
+#                f.write(word + ':\t' + repr(self.cate.cate['TOCATE'][word]) + '\n')
+#        message = wx.MessageDialog(self, _("Export successful\n%s" % self.pathout['dictionnary.txt']), _("Information"), wx.OK|wx.ICON_INFORMATION)
+#        message.ShowModal()
+#        message.Destroy()
+#
+#    def OnStat(self) :
+#        nbtocat, totocat, nbcate, totcate, lenwordincate = self.cate.makestat()
+#        totwords = totocat + totcate
+#        prtocat = repr(round((nbtocat/self.cate.lenwords) * 100 ,2))
+#        prtotocat = repr(round((totocat/totwords) * 100, 2))
+#        prcate = repr(round((totcate/totwords)*100, 2))
+#        prwordincate = repr(round((lenwordincate/self.cate.lenwords)*100, 2))
+#        self.stattxt.SetLabel(self.stat.format(nbtocat, prtocat, totocat, prtotocat, nbcate, lenwordincate, prwordincate, totcate, prcate))
+#
+#    def OnAddToTable(self) :
+#        wordscate = self.cate.getwordscate()
+#        newtab = [['category%i' % i for i in range(1, len(self.tableau.selected_col)+1)]]
+#        for line in self.tableau.select_col(self.tableau.selected_col):
+#            newline = []
+#            for word in line :
+#                newline.append(wordscate.get(word,word))
+#            newtab.append(newline)
+#
+#    def OnAddCate(self, evt) :
+#        print('add a category')
+#        print(self.m_listCate.GetItemCount())
+#        self.cate.addcatefromscratch()
+#        self.m_listCate.dlist = self.cate.getcate()
+#        self.m_listCate.RefreshData(self.m_listCate.dlist)
+#        self.m_listCate.SetSelection(self.m_listCate.GetItemCount() - 1)
+
+
+
+class ListPanel(wx.Panel) :
+     def __init__(self, parent, gparent, List):
+        wx.Panel.__init__(self, parent, style=wx.BORDER_SUNKEN)
+        self.parent = parent
+        self.gparent = gparent
+        self.cate = gparent.cate
+        gsizer =  wx.BoxSizer( wx.HORIZONTAL )
+        self.list = List(self, dlist = gparent.cate, first = ['eff'])
+        gsizer.Add(self.list, 5, wx.EXPAND, 5 )
+        self.SetSizer( gsizer )
+        self.Layout()
+
+
+     def OnStat(self) :
+        self.gparent.OnStat()
+

 class ElCategorizator ( wx.Panel ):
 
     def __init__( self, parent, pathout, tableau, id = wx.ID_ANY, pos = wx.DefaultPosition, size = wx.Size( 500,300 ), style = wx.TAB_TRAVERSAL, name = wx.EmptyString ):
 class ElCategorizator ( wx.Panel ):
 
     def __init__( self, parent, pathout, tableau, id = wx.ID_ANY, pos = wx.DefaultPosition, size = wx.Size( 500,300 ), style = wx.TAB_TRAVERSAL, name = wx.EmptyString ):


@@ -168,15 +343,31 @@ class ElCategorizator ( wx.Panel ):
         gsizer =  wx.BoxSizer( wx.VERTICAL )
 
         bSizer1 = wx.BoxSizer( wx.HORIZONTAL )
         gsizer =  wx.BoxSizer( wx.VERTICAL )
 
         bSizer1 = wx.BoxSizer( wx.HORIZONTAL )

+        splitter = MultiSplitterWindow(self, style=wx.SP_LIVE_UPDATE)
+        self.splitter = splitter
+        #sizer = wx.BoxSizer(wx.HORIZONTAL)
+        #sizer.Add(splitter, 1, wx.EXPAND)
+        #self.SetSizer(sizer)
+        W,H = wx.GetTopLevelParent(self).GetSize()
+        print(W)
+        W = W - 200
+        if W < 300 :
+            W = 300
+        splitsize = int(W/3)
+        print(W)
+        print(H)
+        print(splitsize)
+
+        panelwords = ListPanel(splitter, self, ListForWords)
+        splitter.AppendWindow(panelwords, splitsize)
+        panelcate = ListPanel(splitter, self, ListForCate)
+        splitter.AppendWindow(panelcate, splitsize)
+        panelwordscate = ListPanel(splitter, self, ListForCateWords)
+        splitter.AppendWindow(panelwordscate, splitsize)
+        self.m_listToCate = panelwords.list
+        self.m_listCate = panelcate.list
+        self.m_listCateWords = panelwordscate.list

 
 

-        self.m_listToCate = ListForWords(self, dlist = self.cate, first = ['eff'])
-        bSizer1.Add( self.m_listToCate, 2, wx.ALL|wx.EXPAND, 5 )
-
-        self.m_listCate = ListForCate(self, dlist = self.cate, first = ['eff'])
-        bSizer1.Add( self.m_listCate, 1, wx.ALL|wx.EXPAND, 5 )
-
-        self.m_listCateWords = ListForCateWords(self, dlist = self.cate, first = ['eff'])
-        bSizer1.Add( self.m_listCateWords, 1, wx.ALL|wx.EXPAND, 5 )

 
         bSizer2 = wx.BoxSizer( wx.HORIZONTAL )
 
 
         bSizer2 = wx.BoxSizer( wx.HORIZONTAL )
 


@@ -201,6 +392,12 @@ class ElCategorizator ( wx.Panel ):
         self.nbword = """Words : {:d} ({:d}) | """
 
         self.stat = """ Words to categorize : {:d} ({}%) - {:d} ({}%) -- Categories : {:d} - {:d} ({}%) - {:d} ({}%)"""
         self.nbword = """Words : {:d} ({:d}) | """
 
         self.stat = """ Words to categorize : {:d} ({}%) - {:d} ({}%) -- Categories : {:d} - {:d} ({}%) - {:d} ({}%)"""

+        for panel in [panelwords, panelcate, panelwordscate] :
+            panel.m_listToCate = self.m_listToCate
+            panel.m_listCate = self.m_listCate
+            panel.m_listCateWords = self.m_listCateWords
+            panel.butsave = self.butsave
+

 #        nbtocat, totocat, nbcate, totcate = self.cate.makestat()
 #        lenwords = self.cate.lenwords
 #        totwords = totocat + totcate
 #        nbtocat, totocat, nbcate, totcate = self.cate.makestat()
 #        lenwords = self.cate.lenwords
 #        totwords = totocat + totcate


@@ -214,7 +411,7 @@ class ElCategorizator ( wx.Panel ):
 
 
         gsizer.Add( bSizer2, 0, wx.EXPAND, 5 )
 
 
         gsizer.Add( bSizer2, 0, wx.EXPAND, 5 )

-        gsizer.Add( bSizer1, 2, wx.EXPAND, 5 )
+        gsizer.Add( splitter, 2, wx.EXPAND, 5 )

         gsizer.Add( bSizer3, 0, wx.EXPAND, 5 )
 
         self.butsave.Bind(wx.EVT_BUTTON, self.OnSave)
         gsizer.Add( bSizer3, 0, wx.EXPAND, 5 )
 
         self.butsave.Bind(wx.EVT_BUTTON, self.OnSave)


@@ -227,10 +424,11 @@ class ElCategorizator ( wx.Panel ):
         self.SetSizer( gsizer )
         self.Layout()
 
         self.SetSizer( gsizer )
         self.Layout()
 

+
+

     def __del__( self ):
         pass
 
     def __del__( self ):
         pass
 

-

     def OnLoad(self, event) :
         if len(self.cate.cate['CATE']) != 0 :
             message = wx.MessageDialog(self, _("Categories must be empty to load a categorization."), _("Information"), wx.OK|wx.ICON_WARNING)
     def OnLoad(self, event) :
         if len(self.cate.cate['CATE']) != 0 :
             message = wx.MessageDialog(self, _("Categories must be empty to load a categorization."), _("Information"), wx.OK|wx.ICON_WARNING)


@@ -296,6 +494,7 @@ class ElCategorizator ( wx.Panel ):
         prwordincate = repr(round((lenwordincate/self.cate.lenwords)*100, 2))
         self.stattxt.SetLabel(self.stat.format(nbtocat, prtocat, totocat, prtotocat, nbcate, lenwordincate, prwordincate, totcate, prcate))
 
         prwordincate = repr(round((lenwordincate/self.cate.lenwords)*100, 2))
         self.stattxt.SetLabel(self.stat.format(nbtocat, prtocat, totocat, prtotocat, nbcate, lenwordincate, prwordincate, totcate, prcate))
 

+

     def OnAddToTable(self) :
         wordscate = self.cate.getwordscate()
         newtab = [['category%i' % i for i in range(1, len(self.tableau.selected_col)+1)]]
     def OnAddToTable(self) :
         wordscate = self.cate.getwordscate()
         newtab = [['category%i' % i for i in range(1, len(self.tableau.selected_col)+1)]]


@@ -314,71 +513,6 @@ class ElCategorizator ( wx.Panel ):
         self.m_listCate.SetSelection(self.m_listCate.GetItemCount() - 1)
 
 
         self.m_listCate.SetSelection(self.m_listCate.GetItemCount() - 1)
 
 

-
-#class ListPanel(wx.Panel) :
-#     def __init__(self, parent, gparent, List):
-#        wx.Panel.__init__(self, parent, style=wx.BORDER_SUNKEN)
-#        self.parent = parent
-#        self.cate = gparent.cate
-#        self.list = List(self, dlist = gparent.cate, first = ['eff'])
-
-
-#class ElCategorizator ( wx.Panel ):
-#
-#    def __init__( self, parent, pathout, tableau, id = wx.ID_ANY, pos = wx.DefaultPosition, size = wx.Size( 500,300 ), style = wx.TAB_TRAVERSAL, name = wx.EmptyString ):
-#        wx.Panel.__init__ ( self, parent, id = id, pos = pos, size = size, style = style, name = name )
-#        self.pathout = pathout
-#        self.parent = parent
-#        self.tableau = tableau
-#
-#        self.cate = CategoDict(self.pathout)
-#
-#        splitter = MultiSplitterWindow(self, style=wx.SP_LIVE_UPDATE)
-#        self.splitter = splitter
-#        sizer = wx.BoxSizer(wx.HORIZONTAL)
-#        sizer.Add(splitter, 1, wx.EXPAND)
-#        self.SetSizer(sizer)
-#
-#        panelwords = ListPanel(splitter, self, ListForWords)
-#        splitter.AppendWindow(panelwords, 150)
-#        panelcate = ListPanel(splitter, self, ListForCate)
-#        splitter.AppendWindow(panelcate, 150)
-#        panelwordscate = ListPanel(splitter, self, ListForCateWords)
-#        splitter.AppendWindow(panelwordscate, 150)
-#        self.m_listToCate = panelwords.list
-#        self.m_listCate = panelcate.list
-#        self.m_listCateWords = panelwordscate.list
-#
-#    def __del__( self ):
-#        pass
-#
-#    def OnSave(self, event) :
-#        self.cate.save()
-#        self.butsave.SetBackgroundColour((14, 242, 14, 255))
-#
-#    def OnCSV(self, event) :
-#        wordscate = self.cate.getwordscate()
-#        newtab = [['category%i' % i for i in range(1, len(self.tableau.selected_col)+1)]]
-#        for line in self.tableau.select_col(self.tableau.selected_col):
-#            newline = []
-#            for word in line :
-#                newline.append(wordscate.get(word,word))
-#            newtab.append(newline)
-#        with open(self.pathout['tableout.csv'], 'w') as f :
-#            f.write('\n'.join(['\t'.join(line) for line in newtab]))
-#        print("csv exported !")
-#
-#    def OnDict(self, event):
-#        with open(self.pathout['dictionnary.txt'], 'w') as f :
-#            for categorie in self.cate.cate['CATE'] :
-#                f.write(categorie + ': \t' + repr(self.cate.cate['CATE'][categorie][0]) + '\n')
-#                for word in self.cate.cate['CATE'][categorie][1] :
-#                    f.write('\t' + word + ': \t' + repr(self.cate.cate['CATE'][categorie][1][word]) + '\n')
-#            for word in self.cate.cate['TOCATE'] :
-#                f.write(word + ':\t' + repr(self.cate.cate['TOCATE'][word]) + '\n')
-#        print("dictionnary exported !")
-
-

 class ListForCate(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin):
 
     def __init__(self, parent, dlist = {}, first = [], usefirst = False, menu = True):
 class ListForCate(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.ColumnSorterMixin):
 
     def __init__(self, parent, dlist = {}, first = [], usefirst = False, menu = True):

diff --git a/functions.py b/functions.py
index 3472b77..4a9b857 100755 (executable)
--- a/functions.py
+++ b/functions.py
@@ -50,7 +50,7 @@ def open_folder(folder):
     else:
         opener ="open" if sys.platform == "darwin" else "xdg-open"
         #call([opener, folder])
     else:
         opener ="open" if sys.platform == "darwin" else "xdg-open"
         #call([opener, folder])

-        call(["%s %s &" % (opener, folder)], shell=True)
+        call(["%s '%s' &" % (opener, folder)], shell=True)

 
 def normpath_win32(path) :
     if not sys.platform == 'win32' :
 
 def normpath_win32(path) :
     if not sys.platform == 'win32' :

diff --git a/layout.py b/layout.py
index 302cbed..c671a54 100644 (file)
--- a/layout.py
+++ b/layout.py
@@ -46,6 +46,7 @@ from webexport import WebExport
 from corpus import Corpus
 from sheet import MySheet
 from graph_to_json import GraphToJson
 from corpus import Corpus
 from sheet import MySheet
 from graph_to_json import GraphToJson

+from listlex2 import LexPanel

 
 
 import langue
 
 
 import langue


@@ -751,15 +752,22 @@ class dolexlayout :
         #sash = SashList(ira.nb)
         self.TabStat = aui.AuiNotebook(ira.nb, -1, wx.DefaultPosition)
         self.TabStat.parametres = parametres
         #sash = SashList(ira.nb)
         self.TabStat = aui.AuiNotebook(ira.nb, -1, wx.DefaultPosition)
         self.TabStat.parametres = parametres

+        #self.ListPan = LexPanel(self, ira, self.DictSpec, self.etoiles)

         self.ListPan = ListForSpec(ira, self, self.DictSpec, self.etoiles)
         self.ListPan = ListForSpec(ira, self, self.DictSpec, self.etoiles)

+        self.ListPan.pathout = self.pathout

         if os.path.exists(self.pathout['banalites.csv']) :
             self.listban = ListForSpec(ira, self, self.dictban, ['eff'] + self.etoiles, usefirst = True)
         #self.ListPan2 = ListForSpec(sash.rightwin1, self, self.DictSpec, first)
         self.ListPant = ListForSpec(ira, self, self.DictType, self.etoiles)
         if os.path.exists(self.pathout['banalites.csv']) :
             self.listban = ListForSpec(ira, self, self.dictban, ['eff'] + self.etoiles, usefirst = True)
         #self.ListPan2 = ListForSpec(sash.rightwin1, self, self.DictSpec, first)
         self.ListPant = ListForSpec(ira, self, self.DictType, self.etoiles)

+        self.ListPant.pathout = self.pathout

         self.ListPanEff = ListForSpec(ira, self, self.DictEff, self.etoiles)
         self.ListPanEff = ListForSpec(ira, self, self.DictEff, self.etoiles)

+        self.ListPanEff.pathout = self.pathout

         self.ListPanEffType = ListForSpec(ira, self, self.DictEffType, self.etoiles)
         self.ListPanEffType = ListForSpec(ira, self, self.DictEffType, self.etoiles)

+        self.ListPanEffType.pathout = self.pathout

         self.ListPanEffRelForme = ListForSpec(ira, self, self.DictEffRelForme, self.etoiles)
         self.ListPanEffRelForme = ListForSpec(ira, self, self.DictEffRelForme, self.etoiles)

+        self.ListPanEffRelForme.pathout = self.pathout

         self.ListPanEffRelType = ListForSpec(ira, self, self.DictEffRelType, self.etoiles)
         self.ListPanEffRelType = ListForSpec(ira, self, self.DictEffRelType, self.etoiles)

+        self.ListPanEffRelType.pathout = self.pathout

         self.TabStat.AddPage(self.ListPan, _('Forms'))
         if os.path.exists(self.pathout['banalites.csv']) :
             self.TabStat.AddPage(self.listban, _('Banal forms'))
         self.TabStat.AddPage(self.ListPan, _('Forms'))
         if os.path.exists(self.pathout['banalites.csv']) :
             self.TabStat.AddPage(self.listban, _('Banal forms'))


@@ -781,6 +789,7 @@ class dolexlayout :
         self.ira = ira
         self.TabStat.corpus = self.corpus
         self.TabStat.etoiles = self.etoiles
         self.ira = ira
         self.TabStat.corpus = self.corpus
         self.TabStat.etoiles = self.etoiles

+        self.TabStat.pathout = self.pathout

         if os.path.exists(os.path.join(self.parametres['pathout'], 'tgenspec.csv')) :
             self.parametres['tgenspec'] = os.path.join(self.parametres['pathout'], 'tgenspec.csv')
             TgenLayout(self.TabStat)
         if os.path.exists(os.path.join(self.parametres['pathout'], 'tgenspec.csv')) :
             self.parametres['tgenspec'] = os.path.join(self.parametres['pathout'], 'tgenspec.csv')
             TgenLayout(self.TabStat)


@@ -1361,7 +1370,8 @@ class FreqLayout(DefaultMatLayout) :
         self.tab = wx.html.HtmlWindow(self.ira.nb, -1)
         #self.tab = wx.html2.WebView.New(self)
         res = normpath_win32(self.pathout['resultats.html']).replace('\\','/')
         self.tab = wx.html.HtmlWindow(self.ira.nb, -1)
         #self.tab = wx.html2.WebView.New(self)
         res = normpath_win32(self.pathout['resultats.html']).replace('\\','/')

-        self.tab.LoadPage(res)
+        #self.tab.LoadPage(res)
+        self.tab.LoadFile(res)

         #self.tab.LoadURL(res)
         self.tab.parametres = self.parametres
         self.ira.nb.AddPage(self.tab, ' - '.join([_("Frequency"), self.parametres['name']]))
         #self.tab.LoadURL(res)
         self.tab.parametres = self.parametres
         self.ira.nb.AddPage(self.tab, ' - '.join([_("Frequency"), self.parametres['name']]))


@@ -1374,7 +1384,7 @@ class Chi2Layout(DefaultMatLayout) :
         if "gtk2" in wx.PlatformInfo:
             self.tab.SetStandardFonts()
         res = normpath_win32(self.pathout['resultats-chi2.html']).replace('\\','/')
         if "gtk2" in wx.PlatformInfo:
             self.tab.SetStandardFonts()
         res = normpath_win32(self.pathout['resultats-chi2.html']).replace('\\','/')

-        self.tab.LoadPage(res)
+        self.tab.LoadFile(res)

         self.tab.parametres = self.parametres
         self.ira.nb.AddPage(self.tab, ' - '.join(["Chi2", self.parametres['name']]))
         #self.ira.nb.SetSelection(self.ira.nb.GetPageCount() - 1)
         self.tab.parametres = self.parametres
         self.ira.nb.AddPage(self.tab, ' - '.join(["Chi2", self.parametres['name']]))
         #self.ira.nb.SetSelection(self.ira.nb.GetPageCount() - 1)