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

diff --git a/tabverges.py b/tabverges.py
index b31bf7c..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()
 
@@ -56,11 +52,23 @@ class Prototypical(AnalyseMatrix) :
                     else :
                         self.parametres['limrang'] = self.dial.ranglim.GetValue()
                     self.parametres['freqmin'] = int(self.dial.m_textCtrl4.GetValue())
-                    table_assoc, table_rank = self.dotable()
-                    self.makedatas(table_assoc, table_rank)
-                    self.DoR()
+                    if self.dial.typegraph.GetSelection() == 0 :
+                        self.parametres['typegraph'] = 'classical'
+                        self.parametres['cloud'] = False
+                    elif self.dial.typegraph.GetSelection() == 1 :
+                        self.parametres['typegraph'] = 'classical'
+                        self.parametres['cloud'] = True
+                    else :
+                        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)