Changeset 2612


Ignore:
Timestamp:
Jan 5, 2017 3:02:43 PM (5 years ago)
Author:
toby
Message:

cosmetic changes

Location:
trunk
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/GSASIIplot.py

    r2611 r2612  
    23392339           
    23402340def PlotISFG(G2frame,newPlot=False,plotType=''):
    2341     ''' Plotting package for PDF analysis; displays I(q), S(q), F(q) and G(r) as single
     2341    ''' Plotting package for PDF analysis; displays I(Q), S(Q), F(Q) and G(r) as single
    23422342    or multiple plots with waterfall and contour plots as options
    23432343    '''
     
    24512451    Page.keyPress = OnPlotKeyPress
    24522452    PatternId = G2frame.PatternId
    2453     Plot.set_title(plotType)
    24542453    if plotType == 'G(R)':
    2455         Plot.set_xlabel(r'$R,\AA$',fontsize=14)
     2454        Plot.set_xlabel(r'r,$\AA$',fontsize=14)
     2455        Plot.set_ylabel(r'G(r), $\AA^{-2}$',fontsize=14)
     2456        Plot.set_title('G(r)')
    24562457    else:
    2457         Plot.set_xlabel(r'$Q,\AA$'+superMinusOne,fontsize=14)
    2458     Plot.set_ylabel(r''+plotType,fontsize=14)
     2458        Plot.set_xlabel(r'$Q,\AA^{-1}$'+superMinusOne,fontsize=14)
     2459        Plot.set_ylabel(r''+plotType,fontsize=14)
     2460        Plot.set_title(plotType)
    24592461    colors=['b','g','r','c','m','k']
    24602462    name = G2frame.PatternTree.GetItemText(PatternId)[4:]
     
    25172519                Plot.plot(X,Y,colors[N%6],picker=False)
    25182520            if plotType == 'G(R)':
    2519                 Xb = [0.,10.]
    2520                 Yb = [0.,-40.*np.pi*numbDen]
     2521                Xb = [0.,2.5]
     2522                Yb = [0.,-10.*np.pi*numbDen]
    25212523                Plot.plot(Xb,Yb,color='k',dashes=(5,5))
    25222524            elif plotType == 'F(Q)':
  • trunk/GSASIIpwdGUI.py

    r2611 r2612  
    49734973       
    49744974    G2G.HorizontalLine(mainSizer,G2frame.dataDisplay)
    4975     mainSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' S(Q)->F(Q)->G(R) controls: '),0,WACV)
     4975    mainSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' S(Q)->F(Q)->G(r) controls: '),0,WACV)
    49764976    mainSizer.Add((5,5),0)
    49774977    sqBox = wx.BoxSizer(wx.HORIZONTAL)
     
    50215021   
    50225022    sqBox = wx.BoxSizer(wx.HORIZONTAL)
    5023     sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Scaling q-range: '),0,WACV)
     5023    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Scaling Q-range: '),0,WACV)
    50245024    SQmin = G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data['QScaleLim'],0,nDig=(10,3),
    50255025                                 min=qLimits[0],max=.95*data['QScaleLim'][1],
Note: See TracChangeset for help on using the changeset viewer.