X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=openanalyse.py;h=77d08a754aaf4b527031317231aec14369b13cd3;hp=32702f7190ee62d1da7cacd75fdc941db5c8fd75;hb=2bd16d105beb32d6706f03e4ea717e4c7af43d03;hpb=23c18d65a858461bfb5b62b948522640d6d52507

diff --git a/openanalyse.py b/openanalyse.py
index 32702f7..77d08a7 100644
--- a/openanalyse.py
+++ b/openanalyse.py
@@ -5,13 +5,13 @@
 #Lisense: GNU/GPL
 
 from chemins import ChdTxtPathOut, StatTxtPathOut, PathOut
-from layout import OpenCHDS, dolexlayout, StatLayout, WordCloudLayout, OpenCorpus, SimiLayout, SimiMatLayout
+from layout import OpenCHDS, dolexlayout, StatLayout, WordCloudLayout, OpenCorpus, SimiLayout, SimiMatLayout, ProtoLayout
 from corpus import Corpus, copycorpus
 from tableau import Tableau
 import os
-import shelve
+#import shelve
 #from tabsimi import DoSimi
-from functions import BugReport, DoConf, progressbar
+from functions import DoConf
 from tableau import Tableau
 import logging
 
@@ -131,7 +131,7 @@ 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'] == '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' :
@@ -140,4 +140,6 @@ class OpenAnalyse():
         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)