X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=iramuteq.py;h=1f7b17e8552a453526f8ca2bd2927b34eccc5218;hp=90212a7ab9eb555a3908a99e91cb337a28b5474d;hb=5d84083b41b807307732adb78e1be7fd3e3ff004;hpb=23c18d65a858461bfb5b62b948522640d6d52507

diff --git a/iramuteq.py b/iramuteq.py
index 90212a7..1f7b17e 100644
--- a/iramuteq.py
+++ b/iramuteq.py
@@ -57,7 +57,7 @@ from textdist import AnalysePam
 from textstat import Stat
 from textaslexico import Lexico
 from textsimi import SimiTxt, SimiFromCluster
-from textwordcloud import WordCloud
+from textwordcloud import WordCloud, ClusterCloud
 from profile_segment import ProfileSegment
 #from textcheckcorpus import checkcorpus
 from openanalyse import OpenAnalyse
@@ -101,10 +101,11 @@ ID_SimiTxt = wx.NewId()
 ##########################################################
 #encodage
 if sys.platform == 'darwin' :
-    sys.setdefaultencoding('utf-8')
-    wx.SetDefaultPyEncoding('utf-8')
+    sys.setdefaultencoding('UTF-8')
+    wx.SetDefaultPyEncoding('UTF-8')
 else :
     sys.setdefaultencoding(locale.getpreferredencoding())
+
 #chemin de l'application
 AppliPath = os.path.abspath(os.path.dirname(os.path.realpath(sys.argv[0])))
 #chemin des images
@@ -148,7 +149,6 @@ sys.stdout = printer()
 
 ConfigPath = ConstructConfigPath(UserConfigPath)
 
-
 langues = {'french' : wx.LANGUAGE_FRENCH,
             'english' : wx.LANGUAGE_ENGLISH,}
 #####################################################################
@@ -441,6 +441,7 @@ class IraFrame(wx.Frame):
             self.pref.read(self.ConfigPath['preferences'])
             if IsNew(self) :
                 UpgradeConf(self)
+                self.pref.read(self.ConfigPath['preferences'])
                 New = True
             else :
                 CopyConf(self)
@@ -897,6 +898,8 @@ Voulez-vous fermer quand même ?"""
         except :
             BugReport(self)
 
+    def OnClusterCloud(self, corpus, parametres = None) :
+        self.Text = ClusterCloud(self, corpus, parametres = parametres, dlg = progressbar(self, 3))
 
     def OnAFCM(self, event):
         try: