...

diff --git a/tabchdalc.py b/tabchdalc.py
index b1cff3c..d47d20c 100644 (file)
--- a/tabchdalc.py
+++ b/tabchdalc.py
@@ -83,7 +83,6 @@ class AnalyseQuest(AnalyseMatrix):
         if 'formatted' in self.parametres:
             self.tableau.make_01_alc_format(self.pathout['mat01.csv'])
         else:
         if 'formatted' in self.parametres:
             self.tableau.make_01_alc_format(self.pathout['mat01.csv'])
         else:

-            print self.parametres['listsup']

             self.tableau.make_01_from_selection(self.parametres['listact'], self.parametres['listsup'])
         file = open(self.pathout['listeuce1'], 'w')
         file.write('num uce;num uc\n')
             self.tableau.make_01_from_selection(self.parametres['listact'], self.parametres['listsup'])
         file = open(self.pathout['listeuce1'], 'w')
         file.write('num uce;num uc\n')

diff --git a/tabverges.py b/tabverges.py
index b56d42c..49a9249 100644 (file)
--- a/tabverges.py
+++ b/tabverges.py
@@ -30,11 +30,7 @@ class Prototypical(AnalyseMatrix) :
 #         self.colnames = self.tableau.get_colnames()
 #         AnalyseMatrix.__init__(self, parent, parent.tableau, self.parametres, dlg = dlg)
     
 #         self.colnames = self.tableau.get_colnames()
 #         AnalyseMatrix.__init__(self, parent, parent.tableau, self.parametres, dlg = dlg)
     

-    def doanalyse(self) :
-        res = self.check_val()
-        return res
-
-    def check_val(self) :
+    def doparametres(self, dlg = None):

         self.dial = ProtoDial(self.ira, self.tableau.colnames)
         self.dial.CenterOnParent()
 
         self.dial = ProtoDial(self.ira, self.tableau.colnames)
         self.dial.CenterOnParent()
 


@@ -63,12 +59,16 @@ class Prototypical(AnalyseMatrix) :
                         self.parametres['typegraph'] = 'classical'
                         self.parametres['cloud'] = True
                     else :
                         self.parametres['typegraph'] = 'classical'
                         self.parametres['cloud'] = True
                     else :

-                        self.parametres['typegraph'] = 'plan'      
-                    table_assoc, table_rank = self.dotable()
-                    self.makedatas(table_assoc, table_rank)
-                    self.DoR()
+                        self.parametres['typegraph'] = 'plan'
+                self.dial.Destroy()

         else :
         else :

-            return 'stop'
+            self.dial.Destroy()               
+            self.parametres = None
+    
+    def doanalyse(self) :
+        table_assoc, table_rank = self.dotable()
+        self.makedatas(table_assoc, table_rank)
+        self.DoR()

 
     def dotable(self) :
         table_assoc = self.tableau.select_col(self.ColSel1)
 
     def dotable(self) :
         table_assoc = self.tableau.select_col(self.ColSel1)

diff --git a/tree.py b/tree.py
index 2bbe02b..61114b0 100644 (file)
--- a/tree.py
+++ b/tree.py
@@ -1093,11 +1093,15 @@ class LeftTree(CT.CustomTreeCtrl):
 
         if pydata is not None :
             if 'corpus_name' in pydata or 'corpus' in pydata :
 
         if pydata is not None :
             if 'corpus_name' in pydata or 'corpus' in pydata :

-                self.ira.ShowMenu('text', True)

                 self.ira.ShowMenu('matrix', False)
                 self.ira.ShowMenu('matrix', False)

+                self.ira.ShowMenu('text', True)

             if 'matrix_name' in pydata or 'matrix' in pydata:
                 self.ira.ShowMenu('text', False)
             if 'matrix_name' in pydata or 'matrix' in pydata:
                 self.ira.ShowMenu('text', False)

-                self.ira.ShowMenu('matrix', True)                
+                self.ira.ShowMenu('matrix', True)
+            if 'uuid' in pydata :
+                if pydata['uuid'] in ['textroot', 'matroot'] :
+                    self.ira.ShowMenu('text', False)
+                    self.ira.ShowMenu('matrix', False)             

             self.pydata = pydata
             if pydata['uuid'] in self.parent.history.opened :
                 for i in range(self.parent.nb.GetPageCount()) :
             self.pydata = pydata
             if pydata['uuid'] in self.parent.history.opened :
                 for i in range(self.parent.nb.GetPageCount()) :