X-Git-Url: http://iramuteq.org/git?p=iramuteq;a=blobdiff_plain;f=tabverges.py;h=49a924921c2d60c4b13cd9c638038750cdc57ba4;hp=b56d42c81202fa2eb27f19d5ae22740ef4b4453a;hb=148fe710bf14981c45e865e8b4ddb68333e62f7c;hpb=357e5403d3c539083a1052248628f0aab1af1eaa

diff --git a/tabverges.py b/tabverges.py
index b56d42c..49a9249 100644
--- 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)
     
-    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()
 
@@ -63,12 +59,16 @@ class Prototypical(AnalyseMatrix) :
                         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 :
-            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)