projects
/
iramuteq
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
...
[iramuteq]
/
openanalyse.py
diff --git
a/openanalyse.py
b/openanalyse.py
index
ddb205b
..
77d08a7
100644
(file)
--- a/
openanalyse.py
+++ b/
openanalyse.py
@@
-5,13
+5,13
@@
#Lisense: GNU/GPL
from chemins import ChdTxtPathOut, StatTxtPathOut, PathOut
#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
from corpus import Corpus, copycorpus
from tableau import Tableau
import os
-import shelve
+
#
import shelve
#from tabsimi import DoSimi
#from tabsimi import DoSimi
-from functions import
BugReport,
DoConf
+from functions import DoConf
from tableau import Tableau
import logging
from tableau import Tableau
import logging
@@
-79,7
+79,11
@@
class OpenAnalyse():
log.info('corpus is already opened')
self.doopen(self.parent.history.openedcorpus[self.conf['uuid']])
else :
log.info('corpus is already opened')
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)
@@
-127,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'] == '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' :
@@
-136,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'] == 'simimatrix' :
#self.parent.ShowMenu(_("Spreadsheet analysis"))
SimiMatLayout(self.parent, corpus, self.conf)
+ elif self.conf['type'] == 'proto' :
+ ProtoLayout(self.parent, corpus, self.conf)