From: Pierre Ratinaud <ratinaud@univ-tlse2.fr>
Date: Mon, 3 Nov 2014 23:43:10 +0000 (+0100)
Subject: ...
X-Git-Url: http://iramuteq.org/git?a=commitdiff_plain;h=577acb1594de968ca2550ef0bc1f44e3cf1678f9;p=iramuteq

...
---

diff --git a/iramuteq.py b/iramuteq.py
index 6abc278..0fb8ad3 100644
--- a/iramuteq.py
+++ b/iramuteq.py
@@ -842,9 +842,10 @@ Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, États-Unis."""
         self.analyse_matrix(DoSimi, matrix = matrix, analyse_type = 'simimatrix', dlgnb = 5)
 
     def OnCHDReinert(self, event, matrix = None):
-        if matrix is None :
-            matrix = self.tree.getmatrix()
-        AnalyseQuest(self, matrix, parametres = {'type' : 'reinertmatrix'}, dlg = progressbar(self, 3))
+        #if matrix is None :
+        #    matrix = self.tree.getmatrix()
+        #AnalyseQuest(self, matrix, parametres = {'type' : 'reinertmatrix'}, dlg = 3)
+        self.analyse_matrix(AnalyseQuest, matrix = matrix, analyse_type = 'reinertmatrix', dlgnb = 5)
             
     def OnStudent(self, event):
         try:
diff --git a/tree.py b/tree.py
index aa4d00d..8718845 100644
--- a/tree.py
+++ b/tree.py
@@ -413,7 +413,13 @@ class LeftTree(CT.CustomTreeCtrl):
                     item = self.parent.matrix_menu.FindItemByPosition(i)
                     itemid = item.GetId()
                     itemtext = item.GetText()
-                    menu.Append(itemid, itemtext)
+                    if item.IsSubMenu() :
+                        nmenu = wx.Menu()
+                        for val in item.GetSubMenu().GetMenuItems() :
+                            nmenu.Append(val.GetId(), val.GetText())
+                        menu.AppendMenu(itemid, itemtext, nmenu)
+                    else :
+                        menu.Append(itemid, itemtext)
                 split = wx.Menu()
                 splitfromvar = split.Append(-1, _(u"Split from variable").decode('utf8'))
                 menu.AppendMenu(-1, _(u"Split matrix").decode('utf8'), split)