Changeset 2611 for trunk/GSASIIplot.py


Ignore:
Timestamp:
Jan 4, 2017 10:46:36 PM (5 years ago)
Author:
toby
Message:

Change PDF defaults; option for multiple element addition (added to PDF); replace old single-spot mask option with new; stop overwriting image limits on Copy Controls

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r2607 r2611  
    41244124        Page.figure.suptitle('Defining Polygon mask (use right-mouse to end)',color='r',fontweight='bold')
    41254125        Page.canvas.draw()
    4126     elif G2frame.MaskKey == 's':
    4127         new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('2D Powder Image','mpl',newImage=False)
    4128         Page.figure.suptitle('Left-click to create a spot mask',color='r',fontweight='bold')
    4129         Page.canvas.draw()
    41304126    elif G2frame.MaskKey == 'a':
    41314127        new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('2D Powder Image','mpl',newImage=False)
     
    41554151    '''
    41564152    new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('2D Powder Image','mpl',newImage=False)
    4157     if G2frame.MaskKey == 'm':
     4153    if G2frame.MaskKey == 's':
    41584154        G2frame.MaskKey = ''
    4159         Page.Choice[-1] = 'm: start multiple spot mask mode'
     4155        Page.Choice[-1] = 's: start multiple spot mask mode'
    41604156        wx.CallAfter(PlotImage,G2frame,newImage=True)
    41614157    else:
    4162         G2frame.MaskKey = 'm'
     4158        G2frame.MaskKey = 's'
    41634159        (x0,y0),(x1,y1) = Plot.get_position().get_points()
    4164         Page.figure.suptitle('Multiple spot mode on, press m or right-click to end',color='r',fontweight='bold')
    4165         Page.Choice[-1] = 'm: stop multiple spot mask mode'
     4160        Page.figure.suptitle('Multiple spot mode on, press s or right-click to end',color='r',fontweight='bold')
     4161        Page.Choice[-1] = 's: stop multiple spot mask mode'
    41664162        Page.canvas.draw()
    41674163
     
    42804276            return
    42814277        if treeItem == 'Masks':
    4282             if event.key == 'm': # implement multiple spot mode
     4278            if event.key == 's': # implement multiple spot mode
    42834279                ToggleMultiSpotMask(G2frame)
    42844280                return
     
    43024298                Page.canvas.draw()
    43034299                return
    4304             elif event.key in ['l','p','f','s','a','r']:
     4300            elif event.key in ['l','p','f','a','r']:
    43054301                G2frame.MaskKey = event.key
    43064302                OnStartMask(G2frame)
     
    46344630            if not Xpos or not Ypos or Page.toolbar._active:  #got point out of frame or zoom/pan selected
    46354631                return
    4636             if G2frame.MaskKey == 'm':
     4632            if G2frame.MaskKey == 's':
    46374633                if event.button == 3:
    46384634                    ToggleMultiSpotMask(G2frame)
     
    48254821            Page.keyPress = OnImPlotKeyPress
    48264822        elif G2frame.PatternTree.GetItemText(G2frame.PickId) in ['Masks',]:
    4827             Page.Choice = [' key press','l: log(I) on','s: spot mask','a: arc mask','r: ring mask',
     4823            Page.Choice = [' key press','l: log(I) on','a: arc mask','r: ring mask',
    48284824                'p: polygon mask','f: frame mask',
    48294825                't: add spot mask at mouse position']
    4830             Page.Choice.append('m: start multiple spot mask mode') # this must be the last choice
     4826            Page.Choice.append('s: start multiple spot mask mode') # this must be the last choice
    48314827            if G2frame.logPlot:
    48324828                Page.Choice[1] = 'l: log(I) off'
Note: See TracChangeset for help on using the changeset viewer.