add txm import

[iramuteq] / openanalyse.py

diff --git a/openanalyse.py b/openanalyse.py
index 2cf40c8..77d08a7 100644 (file)
--- a/openanalyse.py
+++ b/openanalyse.py
@@ -4,14 +4,14 @@
 #Copyright (c) 2008-2012, Pierre Ratinaud
 #Lisense: GNU/GPL
 
 #Copyright (c) 2008-2012, Pierre Ratinaud
 #Lisense: GNU/GPL
 

-from chemins import ChdTxtPathOut, StatTxtPathOut, construct_simipath, PathOut
-from layout import OpenCHDS, dolexlayout, StatLayout, WordCloudLayout, OpenCorpus, SimiLayout
+from chemins import ChdTxtPathOut, StatTxtPathOut, PathOut
+from layout import OpenCHDS, dolexlayout, StatLayout, WordCloudLayout, OpenCorpus, SimiLayout, SimiMatLayout, ProtoLayout

 from corpus import Corpus, copycorpus
 from tableau import Tableau
 import os
 from corpus import Corpus, copycorpus
 from tableau import Tableau
 import os

-import shelve
-from tabsimi import DoSimi
-from functions import BugReport, DoConf
+#import shelve
+#from tabsimi import DoSimi
+from functions import DoConf

 from tableau import Tableau
 import logging
 
 from tableau import Tableau
 import logging
 


@@ -73,13 +73,17 @@ class OpenAnalyse():
         log.info('open corpus')
         if self.conf['uuid'] not in self.parent.history.corpus :
             self.parent.history.add(self.conf) 
         log.info('open corpus')
         if self.conf['uuid'] not in self.parent.history.corpus :
             self.parent.history.add(self.conf) 

-            log.info('add to history')
+            log.info('add corpus to history')

             self.parent.tree.OnItemAppend(self.conf)
         if self.conf['uuid'] in self.parent.history.openedcorpus :
             self.parent.tree.OnItemAppend(self.conf)
         if self.conf['uuid'] in self.parent.history.openedcorpus :

-            log.info('corpus is already opened 1')
+            log.info('corpus is already opened')

             self.doopen(self.parent.history.openedcorpus[self.conf['uuid']])
         else :
             self.doopen(self.parent.history.openedcorpus[self.conf['uuid']])
         else :

+            #dial = progressbar(2)
+            #dial.Update(1, 'Ouverture du corpus')

             corpus = Corpus(self, parametres = self.conf, read = self.parent.history.history[self.parent.history.ordercorpus[self.conf['uuid']]]['ira'])
             corpus = Corpus(self, parametres = self.conf, read = self.parent.history.history[self.parent.history.ordercorpus[self.conf['uuid']]]['ira'])

+            #dial.Update(2, 'Fini')
+            #dial.Destroy()

             self.parent.history.openedcorpus[self.conf['uuid']] = corpus
             self.opencorpus_analyses()
             self.doopen(corpus)
             self.parent.history.openedcorpus[self.conf['uuid']] = corpus
             self.opencorpus_analyses()
             self.doopen(corpus)


@@ -102,8 +106,8 @@ class OpenAnalyse():
 
     def openanalyse(self) :
         if self.conf['corpus'] in self.parent.history.openedcorpus :
 
     def openanalyse(self) :
         if self.conf['corpus'] in self.parent.history.openedcorpus :

-            log.info('corpus is already opened 2')
-            corpus = self.parent.history.openedcorpus[self.conf['corpus']]
+            log.info('corpus is already opened')
+            corpus = copycorpus(self.parent.history.openedcorpus[self.conf['corpus']])

         else :
             if os.path.exists(self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira']) :
                 corpus = Corpus(self, parametres = DoConf(self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira']).getoptions('corpus'), read = self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira'])
         else :
             if os.path.exists(self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira']) :
                 corpus = Corpus(self, parametres = DoConf(self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira']).getoptions('corpus'), read = self.parent.history.history[self.parent.history.ordercorpus[self.conf['corpus']]]['ira'])


@@ -127,10 +131,15 @@ class OpenAnalyse():
         elif self.conf['type'] == 'simitxt' or self.conf['type'] == 'clustersimitxt' :
             self.parent.ShowMenu(_("Text analysis"))
             SimiLayout(self.parent, corpus, self.conf)
         elif self.conf['type'] == 'simitxt' or self.conf['type'] == 'clustersimitxt' :
             self.parent.ShowMenu(_("Text analysis"))
             SimiLayout(self.parent, corpus, self.conf)

-        elif self.conf['type'] == 'wordcloud' :
+        elif self.conf['type'] == 'wordcloud' or self.conf['type'] == 'clustercloud':

             self.parent.ShowMenu(_("Text analysis"))
             WordCloudLayout(self.parent, corpus, self.conf)
         elif self.conf['type'] == 'gnepamatrix' :
             self.parent.ShowMenu(_("Text analysis"))
             WordCloudLayout(self.parent, corpus, self.conf)
         elif self.conf['type'] == 'gnepamatrix' :

-            self.parent.ShowMenu(_("Spreadsheet analysis"))
+            #self.parent.ShowMenu(_("Spreadsheet analysis"))

             OpenCHDS(self.parent,  corpus, self.conf, Alceste = False)
             OpenCHDS(self.parent,  corpus, self.conf, Alceste = False)

+        elif self.conf['type'] == 'simimatrix' :
+            #self.parent.ShowMenu(_("Spreadsheet analysis"))
+            SimiMatLayout(self.parent, corpus, self.conf)
+        elif self.conf['type'] == 'proto' :
+            ProtoLayout(self.parent, corpus, self.conf)