simitxt

[iramuteq] / openanalyse.py

diff --git a/openanalyse.py b/openanalyse.py
index 1cf1a03..3290bc4 100644 (file)
--- a/openanalyse.py
+++ b/openanalyse.py
@@ -5,7 +5,7 @@
 #Lisense: GNU/GPL
 
 from chemins import ChdTxtPathOut, StatTxtPathOut, construct_simipath
-from layout import OpenCHDS, dolexlayout, StatLayout, WordCloudLayout, OpenCorpus
+from layout import OpenCHDS, dolexlayout, StatLayout, WordCloudLayout, OpenCorpus, SimiLayout
 #from corpus import Corpus
 from corpusNG import Corpus, copycorpus
 from tableau import Tableau
@@ -61,18 +61,18 @@ class OpenAnalyse():
             self.parent.ShowMenu(_("Text analysis"))
             OpenCHDS(self.parent,  corpus, self.conf, Alceste = True)
         elif self.conf['type'] == 'simitxt' :
-            self.tableau = Tableau(self.parent, self.conf['ira'])
-            self.DictPathOut=construct_simipath(self.conf['pathout'])
-            self.tableau.dictpathout = self.DictPathOut
-            self.tableau.read_tableau(self.tableau.dictpathout['db'])
-            if self.tableau.parametre.get('corpus', False) :
-                self.corpus=corpus
+            self.parent.ShowMenu(_("Text analysis"))
+            SimiLayout(self.parent, corpus, self.conf)
+            #self.tableau = Tableau(self.parent, self.conf['ira'])
+            #self.DictPathOut=construct_simipath(self.conf['pathout'])
+            #self.tableau.dictpathout = self.DictPathOut
+            #self.tableau.read_tableau(self.tableau.dictpathout['db'])
+            #if self.tableau.parametre.get('corpus', False) :
+            #    self.corpus=corpus
                 #self.corpus.read_corpus_from_shelves(self.DictPathOut['corpus'])
-                self.corpus.parametres['openpath'] = self.conf['pathout']
-                self.parent.ShowMenu(_("Text analysis"))
-            DoSimi(self.parent, self.conf, isopen = True, filename = self.conf['ira'], gparent = self, openfromprof=False) 
+            #    self.corpus.parametres['openpath'] = self.conf['pathout']
+            #DoSimi(self.parent, self.conf, isopen = True, filename = self.conf['ira'], gparent = self, openfromprof=False) 
             
-            print 'simi'
 #        try :
 #            #if self.conf['type'] in ['analyse','lexico','stat','wordcloud'] :
 #            #    self.corpus = Corpus(parent)