X-Git-Url: http://iramuteq.org/git?a=blobdiff_plain;f=layout.py;h=6b186e63e4e4aec6076de7adb92cdb407b65bc56;hb=585be25e4c896f0209c6f87c4ccf05cf395faec0;hp=c8532d4cdca644b0b11b7109b48007590cb3f587;hpb=03b6e846e98cd128d1ea0c2c3eeba08565f1b2a1;p=iramuteq

diff --git a/layout.py b/layout.py
index c8532d4..6b186e6 100644
--- a/layout.py
+++ b/layout.py
@@ -38,6 +38,7 @@ from PrintRScript import write_afc_graph, print_simi3d, PrintSimiScript
 from profile_segment import ProfileSegment
 from listlex import *
 from Liste import *
+from elcategorizator import ElCategorizator
 from search_tools import SearchFrame
 from dialog import PrefGraph, PrefExport, PrefSimpleFile, PrefDendro, SimpleDialog, ImageViewer
 from guifunct import SelectColumn, PrepSimi, PrefSimi, redosimi
@@ -406,7 +407,7 @@ class OpenCHDS():
         else :
             corpname = self.corpus.parametres['matrix_name']
             if os.path.exists(self.pathout['analyse.db']) :
-                self.corpus.read_tableau(self.pathout['analyse.db'])
+                self.corpus.read_tableau(self.pathout['analyse'])
         clnb = parametres['clnb']
         dlg = progressbar(self, maxi = 4 + clnb)
         self.clnb = clnb
@@ -1346,7 +1347,7 @@ class DefaultMatLayout :
         self.tableau = tableau
         self.parametres = parametres
         if os.path.exists(self.pathout['analyse.db']) :
-            self.tableau.read_tableau(self.pathout['analyse.db'])
+            self.tableau.read_tableau(self.pathout['analyse'])
         self.dolayout()
         self.ira.nb.SetSelection(self.ira.nb.GetPageCount() - 1)
         self.ira.ShowAPane("Tab_content")
@@ -1398,6 +1399,12 @@ class ProtoLayout(DefaultMatLayout) :
         #self.ira.nb.SetSelection(self.ira.nb.GetPageCount() - 1)
         #self.ira.ShowAPane("Tab_content")
 
+class CateLayout(DefaultMatLayout) :
+
+    def dolayout(self) :
+        self.tableau.read_tableau(self.pathout['analyse'])
+        TabCate = ElCategorizator(self.ira.nb, self.pathout, self.tableau)
+        self.ira.nb.AddPage(TabCate, ' - '.join([_('ElCaTeGoRiZaToR'), self.parametres['name']]))
 
 class SimiMatLayout(DefaultMatLayout) :