Ignore:
Timestamp:
Jul 5, 2017 6:57:25 PM (4 years ago)
Author:
toby
Message:

fix menu binds to dataWindow; fix Help menu for non-mac; dataFrame removal done

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branch/2frame/GSASIIplot.py

    r2908 r2911  
    259259        # One example is GSASII.SumDialog, where a test plot is created. Are there others?
    260260        try:
    261             Page.helpKey = self.G2frame.dataFrame.helpKey
     261            Page.helpKey = self.G2frame.dataWindow.helpKey
    262262        except AttributeError:
    263263            Page.helpKey = 'Data tree'
     
    13361336        elif event.key == 'f' and not G2frame.SinglePlot:
    13371337            choices = G2gd.GetGPXtreeDataNames(G2frame,plotType)
    1338             dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame,'Select dataset to plot',
     1338            dlg = G2G.G2MultiChoiceDialog(G2frame,'Select dataset to plot',
    13391339                'Multidata plot selection',choices)
    13401340            if dlg.ShowModal() == wx.ID_OK:
     
    16661666        elif G2frame.GPXtree.GetItemText(PickId) == 'Background':
    16671667            # selected a fixed background point. Can move it or delete it.
    1668             for mode,id in G2frame.dataFrame.wxID_BackPts.iteritems(): # what menu is selected?
    1669                 if G2frame.dataFrame.BackMenu.FindItemById(id).IsChecked():
     1668            for mode,id in G2frame.dataWindow.wxID_BackPts.iteritems(): # what menu is selected?
     1669                if G2frame.dataWindow.BackMenu.FindItemById(id).IsChecked():
    16701670                    break
    16711671            # mode will be 'Add' or 'Move' or 'Del'
     
    17281728            if G2frame.plotStyle['sqrtPlot']:
    17291729                xy[1] = xy[1]**2
    1730             for mode,id in G2frame.dataFrame.wxID_BackPts.iteritems(): # what menu item is selected?
    1731                 if G2frame.dataFrame.BackMenu.FindItemById(id).IsChecked():
     1730            for mode,id in G2frame.dataWindow.wxID_BackPts.iteritems(): # what menu item is selected?
     1731                if G2frame.dataWindow.BackMenu.FindItemById(id).IsChecked():
    17321732                    break
    17331733            if mode == 'Add':
     
    18461846        Phases = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.PatternId,'Reflection Lists'))
    18471847        Page.phaseList = sorted(Phases.keys()) # define an order for phases (once!)
    1848         G2frame.dataWindow.Bind(wx.EVT_MENU, onMoveDiffCurve, id=G2frame.dataWindow.moveDiffCurve.GetId())
    1849         G2frame.dataWindow.Bind(wx.EVT_MENU, onMoveTopTick, id=G2frame.dataWindow.moveTickLoc.GetId())
    1850         G2frame.dataWindow.Bind(wx.EVT_MENU, onMoveTickSpace, id=G2frame.dataWindow.moveTickSpc.GetId())
     1848        G2frame.Bind(wx.EVT_MENU, onMoveDiffCurve, id=G2frame.dataWindow.moveDiffCurve.GetId())
     1849        G2frame.Bind(wx.EVT_MENU, onMoveTopTick, id=G2frame.dataWindow.moveTickLoc.GetId())
     1850        G2frame.Bind(wx.EVT_MENU, onMoveTickSpace, id=G2frame.dataWindow.moveTickSpc.GetId())
    18511851        G2frame.dataWindow.moveDiffCurve.Enable(False)
    18521852        G2frame.dataWindow.moveTickLoc.Enable(False)
    18531853        G2frame.dataWindow.moveTickSpc.Enable(False)
    18541854    elif G2frame.GPXtree.GetItemText(G2frame.PickId) == 'Peak List':
    1855         G2frame.dataFrame.Bind(wx.EVT_MENU, onMovePeak, id=G2frame.dataWindow.movePeak.GetId())
     1855        G2frame.Bind(wx.EVT_MENU, onMovePeak, id=G2frame.dataWindow.movePeak.GetId())
    18561856    # save information needed to reload from tree and redraw
    18571857    kwargs={'PatternName':G2frame.GPXtree.GetItemText(G2frame.PatternId)}
     
    24472447        elif event.key == 'f' and not G2frame.SinglePlot:
    24482448            choices = G2gd.GetGPXtreeDataNames(G2frame,'PDF ')
    2449             dlg = G2G.G2MultiChoiceDialog(G2frame.dataFrame,'Select dataset to plot',
     2449            dlg = G2G.G2MultiChoiceDialog(G2frame,'Select dataset to plot',
    24502450                'Multidata plot selection',choices)
    24512451            if dlg.ShowModal() == wx.ID_OK:
Note: See TracChangeset for help on using the changeset viewer.