X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=analysetxt.py;h=ad37d5888c9e541fa3f10121b239d33eef1dc224;hp=ff37c9884e3c0ed72da20c8ed7f7d48a26b6899c;hb=b19770356272772c8c8ba75f351520eca186bd19;hpb=e4fcd29b0d143168ba43be91e3c829eceefb0dd3

diff --git a/analysetxt.py b/analysetxt.py
index ff37c98..ad37d58 100644
--- a/analysetxt.py
+++ b/analysetxt.py
@@ -19,26 +19,28 @@ from time import time
 log = logging.getLogger('iramuteq.analyse')
 
 class AnalyseText :
-    def __init__(self, ira, corpus, parametres = None, dlg = False) :
+    def __init__(self, ira, corpus, parametres = None, dlg = False, lemdial = True) :
         self.corpus = corpus
         self.ira = ira
         self.parent = ira
         self.dlg = dlg
         self.dialok = True
         self.parametres = parametres
+        self.lemdial = lemdial
         self.val = False
+        self.keys = DoConf(self.ira.ConfigPath['key']).getoptions()
         if not 'pathout' in self.parametres :
             self.pathout = PathOut(corpus.parametres['originalpath'], analyse_type = parametres['type'], dirout = corpus.parametres['pathout'])
         else :
-            self.pathout = PathOut(filename = corpus.parametres['originalpath'], dirout = self.parametres['pathout'], analyse_type = self.parametres['name'])
+            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 :
             self.parametres = self.make_config(parametres)
         log.info(self.pathout.dirout)
         if self.parametres is not None :
             self.keys = DoConf(self.ira.ConfigPath['key']).getoptions()
-            gramact = [k for k in keys if keys[k] == 1]
-            gramsup = [k for k in keys if keys[k] == 2]
+            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.parametres['pathout'] = self.pathout.mkdirout()
             self.pathout = PathOut(dirout = self.parametres['pathout'])
             self.pathout.createdir(self.parametres['pathout'])
@@ -77,7 +79,7 @@ class AnalyseText :
         pass
 
     def lemparam(self) :
-        if self.dlg :
+        if self.dlg and self.lemdial:
             dial = StatDialog(self, self.parent)
             dial.CenterOnParent()
             val = dial.ShowModal()
@@ -117,7 +119,7 @@ class AnalyseText :
         log.info('R code...')
         pid = exec_rcode(self.ira.RPath, Rscript, wait = wait)
         while pid.poll() is None :
-            if dlg is not None :
+            if dlg :
                 self.dlg.Pulse(message)
                 sleep(0.2)
             else :
@@ -143,6 +145,7 @@ class Alceste(AnalyseText) :
             self.corpus.make_and_write_sparse_matrix_from_uci(self.actives, self.pathout['TableUc1'], self.pathout['listeuce1'])
         Rscript = self.printRscript()
         self.doR(Rscript, dlg = self.dlg, message = 'CHD...')
+
         self.corpus.make_ucecl_from_R(self.pathout['uce'])
         self.corpus.make_and_write_profile(self.actives, self.corpus.lc, self.pathout['Contout'])
         self.sup, lim = self.corpus.make_actives_nb(self.parametres['max_actives'], 2)
@@ -210,34 +213,34 @@ class Alceste(AnalyseText) :
         PrintRapport(self, self.corpus, self.parametres)
 
 
-keys = {'art_def' : 2,
-        'pre' : 2,
-        'adj_dem' : 2,
-        'ono' : 2,
-        'pro_per' : 2,
-        'ver_sup' : 2,
-        'adv' : 1,
-        'ver' : 1,
-        'adj_ind' : 2,
-        'adj_pos' : 2,
-        'aux' : 2,
-        'adj_int' : 2,
-        'pro_ind' : 2,
-        'adj' : 1,
-        'pro_dem' : 2,
-        'nom' : 1,
-        'art_ind' : 2,
-        'pro_pos' : 2,
-        'nom_sup' : 2,
-        'adv_sup' : 2,
-        'adj_sup' : 2,
-        'adj_num' : 2,
-        'pro_rel' : 2,
-        'con' : 2,
-        'num' : 2,
-        'nr' : 1,
-        'sw' : 2,
-}
-
-gramact = [k for k in keys if keys[k] == 1]
-gramsup = [k for k in keys if keys[k] == 2]
+#keys = {'art_def' : 2,
+#        'pre' : 2,
+#        'adj_dem' : 2,
+#        'ono' : 2,
+#        'pro_per' : 2,
+#        'ver_sup' : 2,
+#        'adv' : 1,
+#        'ver' : 1,
+#        'adj_ind' : 2,
+#        'adj_pos' : 2,
+#        'aux' : 2,
+#        'adj_int' : 2,
+#        'pro_ind' : 2,
+#        'adj' : 1,
+#        'pro_dem' : 2,
+#        'nom' : 1,
+#        'art_ind' : 2,
+#        'pro_pos' : 2,
+#        'nom_sup' : 2,
+#        'adv_sup' : 2,
+#        'adj_sup' : 2,
+#        'adj_num' : 2,
+#        'pro_rel' : 2,
+#        'con' : 2,
+#        'num' : 2,
+#        'nr' : 1,
+#        'sw' : 2,
+#}
+#
+#gramact = [k for k in keys if keys[k] == 1]
+#gramsup = [k for k in keys if keys[k] == 2]