Changeset 1033

Timestamp:

Aug 14, 2013 10:04:48 PM (8 years ago)

Author:

toby

Message:

Fix Select tab menu buttons by getting unused Id values

Location:

trunk

Files:

• GSASIIgrid.py (modified) (1 diff)
• GSASIIphsGUI.py (modified) (1 diff)

trunk/GSASIIgrid.py

@@ -1938 +1938 @@
         # Phase / Draw Options tab
         self.DataDrawOptions = wx.MenuBar()
-        self.PrefillDataMenu(self.DataDrawOptions,helpType='Draw Options', helpLbl='Phase/Draw Options',empty=True)
+        self.PrefillDataMenu(self.DataDrawOptions,helpType='Draw Options', helpLbl='Phase/Draw Options')
         self.DataDrawOptions.Append(menu=wx.Menu(title=''),title='Select tab')
-        self.PostfillDataMenu(empty=True)
+        self.PostfillDataMenu()
         
         # Phase / Draw Atoms tab 

trunk/GSASIIphsGUI.py

@@ -4952 +4952 @@
 
     def FillSelectPageMenu(menuBar):
+        '''Assign bindings to the menu buttons to switch between phase tabs;
+        define a dictionary with the page index for each tab
+        '''
+        def OnSelectPage(event):
+            'Called when an item is selected from the Select page menu'
+            page = Pagedict.get(event.GetId())
+            if page is not None: G2frame.dataDisplay.SetSelection(page)
         mid = menuBar.FindMenu('Select tab')
+        Pagedict = {}
         for ipage,page in enumerate(Pages):
             menu = menuBar.GetMenu(mid)
             if menu.FindItem(page) < 0:
-                menu.Append(id=ipage,kind=wx.ITEM_NORMAL,text=page)
-                G2frame.Bind(wx.EVT_MENU, OnSelectPage, id=ipage)
-
-    def OnSelectPage(event):
-        '''This is called when an item is selected from the Select page menu
-        '''
-        page = event.GetId()
-        G2frame.dataDisplay.SetSelection(page)
+                Id = wx.NewId()
+                menu.Append(id=Id,kind=wx.ITEM_NORMAL,text=page)
+                G2frame.Bind(wx.EVT_MENU, OnSelectPage, id=Id)
+                Pagedict[Id] = ipage
+
         
     def OnPageChanged(event):