X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=analysetxt.py;h=201e1772c5fd2044f60caa12c9b569661309b113;hp=e744b64ae407f361ba856e2fae8ecb6d3480ea87;hb=b4b97300a30df02d9e3be9ee0e25ceb628c39676;hpb=c53744151df01b2a1d9181a30e12180d47e94012

diff --git a/analysetxt.py b/analysetxt.py
index e744b64..201e177 100644
--- a/analysetxt.py
+++ b/analysetxt.py
@@ -31,7 +31,6 @@ class AnalyseText :
         else :
             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)
@@ -51,6 +50,7 @@ class AnalyseText :
             if not self.parametres.get('dictionary', False) :
                 self.corpus.make_lems(lem=self.parametres['lem'])
             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'])
@@ -70,6 +70,8 @@ class AnalyseText :
                 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()
                     OpenAnalyse(self.parent, self.parametres['ira'])
                     self.ira.tree.AddAnalyse(self.parametres)
@@ -77,10 +79,13 @@ class AnalyseText :
             else :
                 self.val = False
                 if dlg :
-                    self.dlg.Destroy()
+                    try :
+                        self.dlg.Destroy()
+                    except :
+                        pass
         else :
-            if dlg :
-                self.dlg.Destroy()
+            #if isinstance(dlg, wx.ProgressDialog) :
+            #    self.dlg.Destroy()
             self.val = False
 
     def doanalyse(self) :
@@ -135,40 +140,3 @@ class AnalyseText :
             else :
                 sleep(0.2)
         return check_Rresult(self.ira, pid)
-
-
-
-
-
-
-# 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]