X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=iramuteq.py;h=0fb8ad3c7acf4721de6b97197874edada55262ed;hp=f64e1b52cb238a22fe62168ecb7334007b42109a;hb=577acb1594de968ca2550ef0bc1f44e3cf1678f9;hpb=c53744151df01b2a1d9181a30e12180d47e94012

diff --git a/iramuteq.py b/iramuteq.py
index f64e1b5..0fb8ad3 100644
--- a/iramuteq.py
+++ b/iramuteq.py
@@ -175,6 +175,9 @@ class IraFrame(wx.Frame):
         self.SimiFromCluster = SimiFromCluster
         #langues
         gettext.install('iramuteq',  os.path.join(AppliPath,'locale'), unicode=True)
+        #langues = ['fr_FR', 'en', 'pt_PT']
+        #for l in langues :
+        #    pass
         self.presLan_fr = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=['fr_FR'])
         self.presLan_en = gettext.translation("iramuteq", os.path.join(AppliPath,'locale'), languages=['en'])
         self.setlangue()
@@ -513,6 +516,8 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences."""
             guilangue = self.pref.get('iramuteq', 'guilanguage')
             if guilangue == 'french' :
                 self.presLan_fr.install()
+            elif guilangue == 'portuguese' :
+                self.presLan_pt.install()
             else :
                 self.presLan_en.install()
             mylocale = wx.Locale(langues[guilangue])
@@ -601,16 +606,15 @@ vous devez signaler le chemin de l'éxecutable de R dans les préférences."""
     def OnSubText(self, corpus, parametres = None):
         if corpus is None :
             corpus = self.tree.getcorpus()
-        busy = wx.BusyInfo(_("Please wait...").decode('utf8'), self)
-        wx.SafeYield()
         builder = SubBuilder(self, corpus, parametres)
-        del busy
         if builder.res == wx.ID_OK :
+            busy = wx.BusyInfo(_("Please wait...").decode('utf8'), self)
+            wx.SafeYield()
             corpus = builder.doanalyse()
-            print corpus.parametres['uuid']
             self.history.add(corpus.parametres)
             self.tree.OnItemAppend(corpus.parametres)
             OpenAnalyse(self, corpus.parametres)
+            del busy
             
     def OpenText(self):
         dlg = wx.ProgressDialog("Ouverture...",
@@ -823,38 +827,25 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis."""
     def analyse_matrix(self, analyse, analyse_type = '', matrix = None, dlgnb = 1):
         if matrix is None :
             matrix = self.tree.getmatrix()
-        #try :
-        analyse(self, matrix, parametres = {'type' : analyse_type}, dlg = progressbar(self, dlgnb))
-        #except:
-        #    BugReport(self)           
+        try :
+            analyse(self, matrix, parametres = {'type' : analyse_type}, dlg = dlgnb)
+        except:
+            BugReport(self)           
 
     def OnFreq(self, event, matrix = None):
         self.analyse_matrix(Frequences, analyse_type = 'freq', matrix = matrix, dlgnb = 3)
-        #if matrix is None :
-        #    matrix = self.tree.getmatrix()
-        #try:
-        #    Frequences(self, matrix, parametres = {'type' : 'freq'}, dlg = progressbar(self, 3)) 
-        #except:
-        #    BugReport(self)
 
     def OnChi2(self, event, matrix = None):
-        #try:
         self.analyse_matrix(ChiSquare, matrix = matrix, analyse_type = 'chi2', dlgnb = 3) 
-        #except:
-        #    BugReport(self)
 
     def OnSimiTab(self, event, matrix = None):
-        if matrix is None :
-            matrix = self.tree.getmatrix()
-        try:
-            DoSimi(self, matrix, parametres = {'type' : 'simimatrix'}, dlg = progressbar(self, 3)) 
-        except:
-            BugReport(self)
+        self.analyse_matrix(DoSimi, matrix = matrix, analyse_type = 'simimatrix', dlgnb = 5)
 
     def OnCHDReinert(self, event, matrix = None):
-        if matrix is None :
-            matrix = self.tree.getmatrix()
-        AnalyseQuest(self, matrix, parametres = {'type' : 'reinertmatrix'}, dlg = progressbar(self, 3))
+        #if matrix is None :
+        #    matrix = self.tree.getmatrix()
+        #AnalyseQuest(self, matrix, parametres = {'type' : 'reinertmatrix'}, dlg = 3)
+        self.analyse_matrix(AnalyseQuest, matrix = matrix, analyse_type = 'reinertmatrix', dlgnb = 5)
             
     def OnStudent(self, event):
         try: