Changeset 2612

Timestamp:

Jan 5, 2017 3:02:43 PM (5 years ago)

Author:

toby

Message:

cosmetic changes

Location:

trunk

Files:

• GSASIIplot.py (modified) (3 diffs)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIplot.py

@@ -2339 +2339 @@
             
 def PlotISFG(G2frame,newPlot=False,plotType=''):
-    ''' Plotting package for PDF analysis; displays I(q), S(q), F(q) and G(r) as single 
+    ''' Plotting package for PDF analysis; displays I(Q), S(Q), F(Q) and G(r) as single 
     or multiple plots with waterfall and contour plots as options
     '''
@@ -2451 +2451 @@
     Page.keyPress = OnPlotKeyPress
     PatternId = G2frame.PatternId
-    Plot.set_title(plotType)
     if plotType == 'G(R)':
-        Plot.set_xlabel(r'$R,\AA$',fontsize=14)
+        Plot.set_xlabel(r'r,$\AA$',fontsize=14)
+        Plot.set_ylabel(r'G(r), $\AA^{-2}$',fontsize=14)
+        Plot.set_title('G(r)')
     else:
-        Plot.set_xlabel(r'$Q,\AA$'+superMinusOne,fontsize=14)
-    Plot.set_ylabel(r''+plotType,fontsize=14)
+        Plot.set_xlabel(r'$Q,\AA^{-1}$'+superMinusOne,fontsize=14)
+        Plot.set_ylabel(r''+plotType,fontsize=14)
+        Plot.set_title(plotType)
     colors=['b','g','r','c','m','k']
     name = G2frame.PatternTree.GetItemText(PatternId)[4:]
@@ -2517 +2519 @@
                 Plot.plot(X,Y,colors[N%6],picker=False)
             if plotType == 'G(R)':
-                Xb = [0.,10.]
-                Yb = [0.,-40.*np.pi*numbDen]
+                Xb = [0.,2.5]
+                Yb = [0.,-10.*np.pi*numbDen]
                 Plot.plot(Xb,Yb,color='k',dashes=(5,5))
             elif plotType == 'F(Q)':

trunk/GSASIIpwdGUI.py

@@ -4973 +4973 @@
         
     G2G.HorizontalLine(mainSizer,G2frame.dataDisplay)
-    mainSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' S(Q)->F(Q)->G(R) controls: '),0,WACV)
+    mainSizer.Add(wx.StaticText(G2frame.dataDisplay,label=' S(Q)->F(Q)->G(r) controls: '),0,WACV)
     mainSizer.Add((5,5),0)
     sqBox = wx.BoxSizer(wx.HORIZONTAL)
@@ -5021 +5021 @@
     
     sqBox = wx.BoxSizer(wx.HORIZONTAL)
-    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Scaling q-range: '),0,WACV)
+    sqBox.Add(wx.StaticText(G2frame.dataDisplay,label=' Scaling Q-range: '),0,WACV)
     SQmin = G2G.ValidatedTxtCtrl(G2frame.dataDisplay,data['QScaleLim'],0,nDig=(10,3),
                                  min=qLimits[0],max=.95*data['QScaleLim'][1],