corrections

[iramuteq] / analysetxt.py

diff --git a/analysetxt.py b/analysetxt.py
old mode 100644 (file)
new mode 100755 (executable)
index 201e177..f11a596
--- a/analysetxt.py
+++ b/analysetxt.py
@@ -1,22 +1,35 @@
 # -*- coding: utf-8 -*-
 # -*- coding: utf-8 -*-

-# Author: Pierre Ratinaud
-# lisence : GNU GPL
-# copyright : 2012-2013 (c) Pierre Ratinaud
+#Author: 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 logging
 import logging

-from chemins import PathOut
-from functions import exec_rcode, check_Rresult, DoConf, ReadDicoAsDico, progressbar

 from shutil import copy
 from time import time, sleep
 from uuid import uuid4
 import os
 from shutil import copy
 from time import time, sleep
 from uuid import uuid4
 import os

+
+#------------------------------------
+# import des fichiers du projet
+#------------------------------------
+from chemins import PathOut
+from functions import exec_rcode, check_Rresult, DoConf, ReadDicoAsDico, progressbar

 from openanalyse import OpenAnalyse
 from dialog import StatDialog
 
 from openanalyse import OpenAnalyse
 from dialog import StatDialog
 

+
+

 log = logging.getLogger('iramuteq.analyse')
 
 log = logging.getLogger('iramuteq.analyse')
 

+
+

 class AnalyseText :
 class AnalyseText :

-    def __init__(self, ira, corpus, parametres=None, dlg=False, lemdial=True) :
+
+    def __init__(self, ira, corpus, parametres=None, dlg=False, lemdial=True):

         self.corpus = corpus
         self.ira = ira
         self.parent = ira
         self.corpus = corpus
         self.ira = ira
         self.parent = ira


@@ -26,15 +39,14 @@ class AnalyseText :
         self.lemdial = lemdial
         self.val = False
         self.keys = DoConf(self.ira.ConfigPath['key']).getoptions()
         self.lemdial = lemdial
         self.val = False
         self.keys = DoConf(self.ira.ConfigPath['key']).getoptions()

-        if not 'pathout' in self.parametres :
+        if not 'pathout' in self.parametres:

             self.pathout = PathOut(corpus.parametres['originalpath'], analyse_type=parametres['type'], dirout=corpus.parametres['pathout'])
             self.pathout = PathOut(corpus.parametres['originalpath'], analyse_type=parametres['type'], dirout=corpus.parametres['pathout'])

-        else :
+        else:

             self.pathout = PathOut(filename=corpus.parametres['originalpath'], dirout=self.parametres['pathout'], analyse_type=self.parametres['type'])
         self.parametres = self.lemparam()
             self.pathout = PathOut(filename=corpus.parametres['originalpath'], dirout=self.parametres['pathout'], analyse_type=self.parametres['type'])
         self.parametres = self.lemparam()

-        if self.parametres is not None :
+        if self.parametres is not None:

             self.parametres = self.make_config(parametres)
             self.parametres = self.make_config(parametres)

-        log.info(self.pathout.dirout)
-        if self.parametres is not None :
+        if self.parametres is not None:

             self.keys = DoConf(self.ira.ConfigPath['key']).getoptions()
             gramact = [k for k in self.keys if self.keys[k] == 1]
             gramsup = [k for k in self.keys if self.keys[k] == 2]
             self.keys = DoConf(self.ira.ConfigPath['key']).getoptions()
             gramact = [k for k in self.keys if self.keys[k] == 1]
             gramsup = [k for k in self.keys if self.keys[k] == 2]


@@ -45,12 +57,12 @@ class AnalyseText :
             self.parametres['uuid'] = str(uuid4())
             self.parametres['name'] = os.path.split(self.parametres['pathout'])[1]
             self.parametres['type'] = parametres['type']
             self.parametres['uuid'] = str(uuid4())
             self.parametres['name'] = os.path.split(self.parametres['pathout'])[1]
             self.parametres['type'] = parametres['type']

-            self.parametres['encoding'] = self.ira.syscoding
+            #self.parametres['encoding'] = self.ira.syscoding

             self.t1 = time()
             self.t1 = time()

-            if not self.parametres.get('dictionary', False) :
+            if not self.parametres.get('dictionary', False):

                 self.corpus.make_lems(lem=self.parametres['lem'])
                 self.corpus.make_lems(lem=self.parametres['lem'])

-            else :
-                print 'read new dico'
+            else:
+                print('read new dico')

                 dico = ReadDicoAsDico(self.parametres['dictionary'])
                 self.corpus.make_lems_from_dict(dico, dolem=self.parametres['lem'])
                 dictname = os.path.basename(self.parametres['dictionary'])
                 dico = ReadDicoAsDico(self.parametres['dictionary'])
                 self.corpus.make_lems_from_dict(dico, dolem=self.parametres['lem'])
                 dictname = os.path.basename(self.parametres['dictionary'])


@@ -58,24 +70,25 @@ class AnalyseText :
                 copy(self.parametres['dictionary'], dictpath)
                 self.parametres['dictionary'] = dictpath
             self.corpus.parse_active(gramact, gramsup)
                 copy(self.parametres['dictionary'], dictpath)
                 self.parametres['dictionary'] = dictpath
             self.corpus.parse_active(gramact, gramsup)

-            if dlg :
-                self.dlg = progressbar(self.ira, dlg)
+#            if dlg:
+#                self.dlg = progressbar(self.ira, dlg)

             result_analyse = self.doanalyse()
             result_analyse = self.doanalyse()

-            if result_analyse is None :
+            if result_analyse is None:

                 self.time = time() - self.t1
                 minutes, seconds = divmod(self.time, 60)
                 self.time = time() - self.t1
                 minutes, seconds = divmod(self.time, 60)

-                hours, minutes = divmod(minutes, 60)            
+                hours, minutes = divmod(minutes, 60)

                 self.parametres['time'] = '%.0fh %.0fm %.0fs' % (hours, minutes, seconds)
                 self.parametres['ira'] = self.pathout['Analyse.ira']
                 DoConf().makeoptions([self.parametres['type']], [self.parametres], self.pathout['Analyse.ira'])
                 self.ira.history.add(self.parametres)
                 if dlg :
                 self.parametres['time'] = '%.0fh %.0fm %.0fs' % (hours, minutes, seconds)
                 self.parametres['ira'] = self.pathout['Analyse.ira']
                 DoConf().makeoptions([self.parametres['type']], [self.parametres], self.pathout['Analyse.ira'])
                 self.ira.history.add(self.parametres)
                 if dlg :

-                    if not isinstance(dlg, int) :
-                        dlg.Destroy()
-                    self.dlg.Destroy()
+#                    if not isinstance(dlg, int) :
+#                        dlg.Destroy()
+                    self.dlg = progressbar(self.ira, dlg)

                     OpenAnalyse(self.parent, self.parametres['ira'])
                     self.ira.tree.AddAnalyse(self.parametres)
                     self.val = 5100
                     OpenAnalyse(self.parent, self.parametres['ira'])
                     self.ira.tree.AddAnalyse(self.parametres)
                     self.val = 5100

+                    self.dlg.Destroy()

             else :
                 self.val = False
                 if dlg :
             else :
                 self.val = False
                 if dlg :


@@ -95,26 +108,27 @@ class AnalyseText :
         if self.dlg and self.lemdial:
             dial = StatDialog(self.parent, self.keys)
             dial.CenterOnParent()
         if self.dlg and self.lemdial:
             dial = StatDialog(self.parent, self.keys)
             dial.CenterOnParent()

+            dial.corpus = self.corpus

             val = dial.ShowModal()
             if val == 5100 :
                 if dial.radio_lem.GetSelection() == 0 :
                     lem = 1
                 else :
             val = dial.ShowModal()
             if val == 5100 :
                 if dial.radio_lem.GetSelection() == 0 :
                     lem = 1
                 else :

-                    lem = 0            
+                    lem = 0

                 self.parametres['lem'] = lem
                 if dial.radio_dictchoice.GetSelection() == 1 :
                 self.parametres['lem'] = lem
                 if dial.radio_dictchoice.GetSelection() == 1 :

-                    self.parametres['dictionary'] = dial.dictpath.GetValue() 
+                    self.parametres['dictionary'] = dial.dictpath.GetValue()

                 dial.Destroy()
                 return self.parametres
             else :
                 dial.Destroy()
                 dial.Destroy()
                 return self.parametres
             else :
                 dial.Destroy()

-                return None        
+                return None

         else :
             return self.parametres
 
     def make_config(self, config) :
         if config is not None :
         else :
             return self.parametres
 
     def make_config(self, config) :
         if config is not None :

-            if not self.dlg : 
+            if not self.dlg :

                 return config
             else :
                 return self.preferences()
                 return config
             else :
                 return self.preferences()


@@ -131,12 +145,19 @@ class AnalyseText :
         pass
 
     def doR(self, Rscript, wait=False, dlg=None, message='') :
         pass
 
     def doR(self, Rscript, wait=False, dlg=None, message='') :

-        log.info('R code...')
+        log.info('R code... ')
+        # idéalement, la fonction prendrait en charge la création/destruction de sa propre fenêtre de progression
+        if isinstance(dlg, int):
+            dialProgression = progressbar(self, dlg)
+        else:
+            dialProgression = dlg

         pid = exec_rcode(self.ira.RPath, Rscript, wait=wait)
         while pid.poll() is None :
             if dlg :
         pid = exec_rcode(self.ira.RPath, Rscript, wait=wait)
         while pid.poll() is None :
             if dlg :

-                self.dlg.Pulse(message)
+                dialProgression.Pulse(message)

                 sleep(0.2)
             else :
                 sleep(0.2)
                 sleep(0.2)
             else :
                 sleep(0.2)

+        if isinstance(dlg, int):
+            dialProgression.Destroy()

         return check_Rresult(self.ira, pid)
         return check_Rresult(self.ira, pid)