Changeset 4103

Timestamp:

Aug 20, 2019 3:29:50 PM (4 years ago)

Author:

vondreele

Message:

get Pair distribution plot if available when selected
reorder SHAPES results plot so bead model shown last

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (1 diff)
• GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIdataGUI.py

@@ -8326 +8326 @@
             G2pdG.UpdateREFDModelsGrid(G2frame,data)
         G2plt.PlotPatterns(G2frame,plotType=prfx1)
-        if prfx1 == 'SASD' and len(data['Size']['Distribution']):
-            G2plt.PlotSASDSizeDist(G2frame)
+        if prfx1 == 'SASD':
+            if len(data['Size']['Distribution']):
+                G2plt.PlotSASDSizeDist(G2frame)
+            if len(data['Pair']['Distribution']):
+                G2plt.PlotSASDPairDist(G2frame)
     elif G2frame.GPXtree.GetItemText(item) == 'Substances':
         G2frame.PatternId = G2frame.GPXtree.GetItemParent(item)

trunk/GSASIIpwdGUI.py

@@ -5248 +5248 @@
         elif 'Size' in PlotText:
             G2plt.PlotSASDSizeDist(G2frame)
+        elif 'Pair' in PlotText:
+            G2plt.PlotSASDPairDist(G2frame)
+            
                 
     def OnAddModel(event):
@@ -5693 +5696 @@
             print('%s %.3f'%('selected r value',pattern[-1]))
             print('%s %.3f'%('selected Delta P(r)',PRcalc[r][-1]))
-            G2plt.PlotBeadModel(G2frame,selAtoms,plotDefaults)
             RefreshPlots(True)
             G2plt.PlotSASDPairDist(G2frame)
+            G2plt.PlotBeadModel(G2frame,selAtoms,plotDefaults)
         
         shapeSizer = wx.BoxSizer(wx.VERTICAL)