Changeset 2637


Ignore:
Timestamp:
Jan 17, 2017 12:13:28 PM (5 years ago)
Author:
vondreele
Message:

fix delete data item selection to include only data items
expand the choices for stride in data selection dialog
cosmetic stuff in plots

Location:
trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASII.py

    r2636 r2637  
    31353135                name = self.PatternTree.GetItemText(item)
    31363136                if name not in ['Notebook','Controls','Covariance','Constraints',
    3137                     'Restraints','Phases','Rigid bodies'] or 'Sequential' not in name:
     3137                    'Restraints','Phases','Rigid bodies'] and 'Sequential' not in name:
    31383138                    if 'PWDR' in name: nItems['PWDR'] += 1
    31393139                    if 'SASD' in name: nItems['SASD'] += 1
  • trunk/GSASIIctrls.py

    r2634 r2637  
    13851385            tSizer.Add(togBut)
    13861386            tSizer.Add(wx.StaticText(self,label=' Set Stride:'),0,WACV)
    1387             numbs = [str(i+1) for i in range(10)]
     1387            numbs = [str(i+1) for i in range(9)]+[str(2*i+10) for i in range(6)]
    13881388            self.stride = wx.ComboBox(self,value='1',choices=numbs,style=wx.CB_READONLY|wx.CB_DROPDOWN)
    13891389            self.stride.Bind(wx.EVT_COMBOBOX,self.OnStride)
  • trunk/GSASIIplot.py

    r2634 r2637  
    2222import wx.glcanvas
    2323import matplotlib as mpl
     24import matplotlib.collections as mplC
    2425import mpl_toolkits.mplot3d.axes3d as mp3d
    2526import GSASIIpath
     
    23482349    or multiple plots with waterfall and contour plots as options
    23492350    '''
    2350     import matplotlib.collections as mplC
    23512351    if not plotType:
    23522352        plotType = G2frame.G2plotNB.plotList[G2frame.G2plotNB.nb.GetSelection()]
    23532353    if plotType not in ['I(Q)','S(Q)','F(Q)','G(R)']:
    23542354        return
    2355     superMinusOne = unichr(0xaf)+unichr(0xb9)
    23562355   
    23572356    def OnPlotKeyPress(event):
     
    24832482        Plot.set_xlabel(r'r,$\AA$',fontsize=14)
    24842483        Plot.set_ylabel(r'G(r), $\AA^{-2}$',fontsize=14)
    2485         Plot.set_title(name)
    24862484    else:
    24872485        Plot.set_xlabel(r'$Q,\AA^{-1}$',fontsize=14)
    24882486        Plot.set_ylabel(r''+plotType,fontsize=14)
    2489         Plot.set_title(name)
     2487    Plot.set_title(name)
    24902488    colors=['b','g','r','c','m','k']
    24912489    PDFdata = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(G2frame,PatternId, 'PDF Controls'))
     
    25432541        acolor = mpl.cm.get_cmap(G2frame.ContourColor)
    25442542        if XYlist.shape[0]>1:           
     2543            colorRange = np.arange(XYlist.shape[0])
    25452544            lines = mplC.LineCollection(XYlist,cmap=acolor)
     2545            lines.set_array(colorRange)
    25462546        else:
    25472547            lines = mplC.LineCollection(XYlist,color=colors[0])
    2548         lines.set_array(np.arange(XYlist.shape[0]))
    25492548        Plot.add_collection(lines)
    25502549        if plotType == 'G(R)':
     
    25582557        if XYlist.shape[0] > 1:
    25592558            axcb = Page.figure.colorbar(lines)
    2560             axcb.set_label('Run number')
     2559            axcb.set_label('PDF number')
    25612560       
    25622561#    elif G2frame.Legend:
Note: See TracChangeset for help on using the changeset viewer.