X-Git-Url: http://www.iramuteq.org/git?a=blobdiff_plain;f=textwordcloud.py;h=aa669eb25fc0bed66c0baafada147b4343b32e23;hb=refs%2Fheads%2F3.0;hp=a85866acb8fbe7eb851c276d86350c68db97e591;hpb=eb614c725930bc65a7ad43eda1b769b504433f88;p=iramuteq

diff --git a/textwordcloud.py b/textwordcloud.py
index a85866a..aa669eb 100644
--- a/textwordcloud.py
+++ b/textwordcloud.py
@@ -1,30 +1,43 @@
-#!/bin/env python
 # -*- coding: utf-8 -*-
 #Author: Pierre Ratinaud
-#Copyright (c) 2008-2009 Pierre Ratinaud
+#Copyright (c) 2008-2020 Pierre Ratinaud
+#modification pour python 3 : Laurent Mérat, 6x7 - mai 2020
 #License: GNU/GPL
 
+#------------------------------------
+# import des modules python
+#------------------------------------
+import tempfile
+import os
+import logging
+
+#------------------------------------
+# import des modules wx
+#------------------------------------
+import wx
+
+#------------------------------------
+# import des fichiers du projet
+#------------------------------------
 from analysetxt import AnalyseText
 from guifunct import getPage, getCorpus, SelectColumn
-from ConfigParser import RawConfigParser
-from functions import sortedby, progressbar, CreateIraFile, exec_rcode, check_Rresult, MessageImage
+from functions import sortedby, progressbar 
 from dialog import StatDialog, PrefWordCloud
 from PrintRScript import WordCloudRScript
-#from ttparser import * 
-import tempfile
-from time import sleep
-import wx
-import os
-import logging
+
 
 logger = logging.getLogger('iramuteq.textwordcloud')
 
 
 class WordCloud(AnalyseText):
+
     def doanalyse(self) :
         self.parametres['type'] = 'wordcloud'
         #FIXME
         limit = 3
+
+#        self.dlg.Destroy()
+
         res = self.make_option()
         if res == wx.ID_OK :
             if self.parametres['mode'] == 2 :
@@ -35,14 +48,19 @@ class WordCloud(AnalyseText):
             elif self.parametres['mode'] == 1 :
                 self.actives = self.corpus.make_actives_limit(limit, 2)
             dictcol = dict([[i, [act, self.corpus.getlemeff(act)]] for i, act in enumerate(self.actives)]) 
-            SelectColumn(self.ira, dictcol, self.actives, self.pathout['selected.csv'], dlg = True)
-            self.make_wordcloud()
-            script = WordCloudRScript(self)
-            script.make_script()
-            self.doR(script.scriptout, dlg = self.dlg, message = 'R...')
+            selectcol = SelectColumn(self.ira, dictcol, self.actives, self.pathout['selected.csv'], dlg = True)
+            if selectcol.ok :
+                self.dlg = progressbar(self.ira, 2)
+                self.make_wordcloud()
+                script = WordCloudRScript(self)
+                script.make_script()
+                self.doR(script.scriptout, dlg = self.dlg, message = 'R...')
+                self.dlg.Destroy()
+            else :
+                return 'NOK'
         else :
             return 'NOK'
-    
+
     def make_option(self, fromcluster = False) :
         dial = PrefWordCloud(self.ira, fromcluster)
         dial.CenterOnParent()
@@ -76,32 +94,39 @@ class WordCloud(AnalyseText):
         return res
 
     def make_wordcloud(self) :
-        act = ['\t'.join([act, `self.corpus.getlemeff(act)`]) for act in self.actives]
-        with open(self.pathout['actives_eff.csv'], 'w') as f :
-            f.write('\n'.join(act).encode(self.ira.syscoding))
+        act = ['\t'.join([act, repr(self.corpus.getlemeff(act))]) for act in self.actives]
+        with open(self.pathout['actives_eff.csv'], 'w', encoding='utf8') as f :
+            f.write('\n'.join(act))
 
 
-class ClusterCloud(WordCloud) :
-    def doanalyse(self) :
+class ClusterCloud(WordCloud):
+
+    def doanalyse(self):
+        print('ClusterCloud')
         self.parametres['type'] = 'clustercloud'
         #FIXME
         limit = 2
-        res = self.make_option(True)
+        res = self.make_option(True) #dialogue d'options de WordCloud.make_option
         if res == wx.ID_OK :
             prof = self.parametres['clusterprof']
             del self.parametres['clusterprof']
-            if self.parametres['indice'] == 0 :
+            if self.parametres['indice'] == 0:
                 tokeep = 1
-            else : 
+            else: 
                 tokeep = 2
             prof = [[val[0], int(round(val[tokeep]))] for val in prof]
-            with open(self.pathout['actives_eff.csv'], 'w') as f :
-                f.write('\n'.join(['\t'.join([val[0], `val[1]`]) for val in prof]).encode(self.ira.syscoding))
+            with open(self.pathout['actives_eff.csv'], 'w', encoding='utf8') as f :
+                f.write('\n'.join(['\t'.join([val[0], repr(val[1])]) for val in prof]))
             dictcol = dict([[i, val] for i, val in enumerate(prof)])
             self.actives = [val[0] for val in prof]
             SelectColumn(self.ira, dictcol, self.actives, self.pathout['selected.csv'], dlg = True)
             script = WordCloudRScript(self)
             script.make_script()
-            self.doR(script.scriptout, dlg = self.dlg, message = 'R...')
-        else :
+
+            dialProgression = progressbar(self.ira, self.dlg)
+            self.doR(script.scriptout, dlg = dialProgression, message = 'R...')
+            dialProgression.Destroy()
+
+        else:
             return 'NOK'
+