from mac

[iramuteq] / openanalyse.py

diff --git a/openanalyse.py b/openanalyse.py
index 22cf584..32702f7 100644 (file)
--- a/openanalyse.py
+++ b/openanalyse.py
@@ -11,7 +11,7 @@ from tableau import Tableau
 import os
 import shelve
 #from tabsimi import DoSimi
-from functions import BugReport, DoConf
+from functions import BugReport, DoConf, progressbar
 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('add to history')
+            log.info('add corpus to history')
             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 :
+            #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'])
+            #dial.Update(2, 'Fini')
+            #dial.Destroy()
             self.parent.history.openedcorpus[self.conf['uuid']] = corpus
             self.opencorpus_analyses()
             self.doopen(corpus)
@@ -102,7 +106,7 @@ class OpenAnalyse():
 
     def openanalyse(self) :
         if self.conf['corpus'] in self.parent.history.openedcorpus :
-            log.info('corpus is already opened 2')
+            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']) :