Changeset 1538

Timestamp:

Oct 26, 2014 5:30:49 AM (7 years ago)

Author:

toby

Message:

simplify Select tab for phases to look up text from menu item; old code did not work on Mac consistently

File:

• trunk/GSASIIphsGUI.py (modified) (2 diffs)

trunk/GSASIIphsGUI.py

@@ -5456 +5456 @@
 
     def FillSelectPageMenu(menuBar):
-        '''Assign bindings to the menu buttons to switch between phase tabs;
-        define a dictionary with the page index for each tab
+        '''Fill "Select tab" menu with menu items for each tab and assign
+        bindings to the menu ietm to switch between phase tabs
         '''
         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)
+            # lookup the menu item that called us and get its text
+            mid = menuBar.FindMenu('Select tab')
+            menu = menuBar.GetMenu(mid)
+            tabname = menu.FindItemById(event.GetId()).Label
+            # find the matching tab
+            for PageNum in range(G2frame.dataDisplay.GetPageCount()):
+                if tabname == G2frame.dataDisplay.GetPageText(PageNum):
+                    G2frame.dataDisplay.SetSelection(PageNum)
+                    return
+            else:
+                print "Warning: tab "+tabname+" was not found"
         mid = menuBar.FindMenu('Select tab')
-        Pagedict = {}
         for ipage,page in enumerate(Pages):
             menu = menuBar.GetMenu(mid)
@@ -5471 +5479 @@
                 menu.Append(id=Id,kind=wx.ITEM_NORMAL,text=page)
                 G2frame.Bind(wx.EVT_MENU, OnSelectPage, id=Id)
-                Pagedict[Id] = ipage
-
         
     def OnPageChanged(event):