...

diff --git a/ProfList.py b/ProfList.py
index c9b1ce1..a127a04 100644 (file)
--- a/ProfList.py
+++ b/ProfList.py
@@ -45,6 +45,7 @@ class ProfListctrlPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Col
         self.cl = cl
         self.var_mod = {}
         self.them_mod = {}
         self.cl = cl
         self.var_mod = {}
         self.them_mod = {}

+        self.ira = wx.GetApp().GetTopWindow()

 
         line1 = profclasse.pop(0)
         classen = [line for line in profclasse if line[0] != '*' and line[0] != '*****']
 
         line1 = profclasse.pop(0)
         classen = [line for line in profclasse if line[0] != '*' and line[0] != '*****']


@@ -546,7 +547,7 @@ class ProfListctrlPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Col
                         'lem' : self.Source.parametres['lem'],
                         'tmpchi' : self.tmpchi}
         #try :
                         'lem' : self.Source.parametres['lem'],
                         'tmpchi' : self.tmpchi}
         #try :

-        self.parent.SimiFromCluster(self.parent, self.Source.corpus, self.la, self.lfreq, self.lchi, self.cl - 1, parametres = parametres, dlg = progressbar(self, 4))
+        self.parent.SimiFromCluster(self.parent, self.Source.corpus, self.la, self.lfreq, self.lchi, self.cl - 1, parametres = parametres, dlg = progressbar(self.ira, 4))

         #except :
         #    print 'not acitve'
 
         #except :
         #    print 'not acitve'
 


@@ -560,7 +561,7 @@ class ProfListctrlPanel(wx.ListCtrl, listmix.ListCtrlAutoWidthMixin, listmix.Col
                         'lem' : self.Source.parametres['lem'],
                         'tmpchi' : self.tmpchi}
 
                         'lem' : self.Source.parametres['lem'],
                         'tmpchi' : self.tmpchi}
 

-        self.parent.SimiFromCluster(self.parent, self.Source.corpus, self.la, self.lfreq, self.lchi, self.cl - 1, parametres = parametres, dlg = progressbar(self, 4))
+        self.parent.SimiFromCluster(self.parent, self.Source.corpus, self.la, self.lfreq, self.lchi, self.cl - 1, parametres = parametres, dlg = progressbar(self.ira, 4))

 
     def on_segments(self,evt) :
         dlg = progressbar(self, 2)
 
     def on_segments(self,evt) :
         dlg = progressbar(self, 2)

diff --git a/dialog.py b/dialog.py
index 111e0c0..8de76bc 100755 (executable)
--- a/dialog.py
+++ b/dialog.py
@@ -3174,7 +3174,7 @@ class MessageImage(wx.Frame):
         if parametres['svg'] == 'TRUE' :
             self.imagename = u"image.svg"
         else :
         if parametres['svg'] == 'TRUE' :
             self.imagename = u"image.svg"
         else :

-            self.imagename = u"iamge.png"
+            self.imagename = u"image.png"

         self.HtmlPage = wx.html.HtmlWindow(self, -1)
         self.HtmlPage.SetMinSize(size)
         if "gtk2" in wx.PlatformInfo:
         self.HtmlPage = wx.html.HtmlWindow(self, -1)
         self.HtmlPage.SetMinSize(size)
         if "gtk2" in wx.PlatformInfo:

diff --git a/textsimi.py b/textsimi.py
index dd5349c..454074d 100644 (file)
--- a/textsimi.py
+++ b/textsimi.py
@@ -4,19 +4,13 @@
 #License: GNU/GPL
 
 from chemins import ffr, simipath
 #License: GNU/GPL
 
 from chemins import ffr, simipath

-#from corpus import Corpus

 import os
 from analysetxt import AnalyseText
 import os
 from analysetxt import AnalyseText

-#from ConfigParser import RawConfigParser
-#from guifunct import getPage, getCorpus

 from guifunct import PrepSimi
 from functions import indices_simi, progressbar, treat_var_mod, read_list_file, print_liste
 from guifunct import PrepSimi
 from functions import indices_simi, progressbar, treat_var_mod, read_list_file, print_liste

-#from tableau import Tableau
-#from tabsimi import DoSimi

 from PrintRScript import PrintSimiScript
 import wx
 from copy import copy
 from PrintRScript import PrintSimiScript
 import wx
 from copy import copy

-

 import logging
 
 log = logging.getLogger('iramuteq.textsimi')
 import logging
 
 log = logging.getLogger('iramuteq.textsimi')


@@ -123,7 +117,8 @@ class SimiFromCluster(SimiTxt) :
         self.lfreq = lfreq
         self.lchi = lchi
         parametres['name'] = 'simi_classe_%i' % (numcluster + 1)
         self.lfreq = lfreq
         self.lchi = lchi
         parametres['name'] = 'simi_classe_%i' % (numcluster + 1)

-        SimiTxt.__init__(self, ira, corpus, parametres, dlg, lemdial = False)
+        dlg.Destroy()
+        SimiTxt.__init__(self, ira, corpus, parametres, dlg=True, lemdial = False)

     
     def preferences(self) :
         return self.parametres
     
     def preferences(self) :
         return self.parametres


@@ -138,9 +133,9 @@ class SimiFromCluster(SimiTxt) :
             del self.parametres['bystar']
         dictcol = dict([[i, [act, self.corpus.getlemclustereff(act, self.numcluster)]] for i, act in enumerate(self.actives)]) 
         continu = True
             del self.parametres['bystar']
         dictcol = dict([[i, [act, self.corpus.getlemclustereff(act, self.numcluster)]] for i, act in enumerate(self.actives)]) 
         continu = True

+        #print self.dlg

         if self.dlg :
         if self.dlg :

-            #self.listet = self.corpus.make_etoiles()
-            #self.listet.sort()
+            self.dlg.Destroy()

             self.stars = []#copy(self.listet)
             self.parametres['stars'] = 0#copy(self.listet)
             self.parametres['sfromchi'] = 1
             self.stars = []#copy(self.listet)
             self.parametres['stars'] = 0#copy(self.listet)
             self.parametres['sfromchi'] = 1


@@ -151,6 +146,7 @@ class SimiFromCluster(SimiTxt) :
             else :
                 continu = False
         if continu :
             else :
                 continu = False
         if continu :

+            self.dlg = progressbar(self.parent, 3)

             self.makefiles()
             self.parametres['type'] = 'clustersimitxt'
             script = PrintSimiScript(self)
             self.makefiles()
             self.parametres['type'] = 'clustersimitxt'
             script = PrintSimiScript(self)