Changeset 3761 for trunk/GSASIIpwdGUI.py

Timestamp:

Dec 12, 2018 2:38:33 PM (4 years ago)

Author:

vondreele

Message:

avoid replotting structure if atom refine flags are changed
add new plot for structure factors as 1D stick diagram - work in progress

File:

• trunk/GSASIIpwdGUI.py (modified) (2 diffs)

trunk/GSASIIpwdGUI.py

@@ -4404 +4404 @@
     if 'UsrReject' in Controls:
         dMin = Controls['UsrReject'].get('MinD',0.05)
+
+    def OnPlot1DHKL(event):
+        phaseName = G2frame.RefList
+        if phaseName not in ['Unknown',]:
+            pId = G2gd.GetGPXtreeItemId(G2frame,G2frame.root,'Phases')
+            phaseId =  G2gd.GetGPXtreeItemId(G2frame,pId,phaseName)
+            General = G2frame.GPXtree.GetItemPyData(phaseId)['General']
+            Super = General.get('Super',0)
+        else:
+            Super = 0
+        if 'list' in str(type(data)):   #single crystal data is 2 dict in list
+            refList = data[1]['RefList']
+        else:                           #powder data is a dict of dicts; each same structure as SC 2nd dict
+            if 'RefList' in data[phaseName]:
+                refList = np.array(data[phaseName]['RefList'])
+            else:
+                wx.MessageBox('No reflection list - do Refine first',caption='Reflection plotting')
+                return
+        G2plt.Plot1DSngl(G2frame,newPlot=True,hklRef=refList,Super=Super,Title=phaseName)
+
     def OnPlotHKL(event):
         '''Plots a layer of reflections
@@ -4622 +4642 @@
     if HKLF:
         G2frame.Bind(wx.EVT_MENU, OnPlotHKL, id=G2G.wxID_PWDHKLPLOT)
+        G2frame.Bind(wx.EVT_MENU, OnPlot1DHKL, id=G2G.wxID_1DHKLSTICKPLOT)
         G2frame.Bind(wx.EVT_MENU, OnPlot3DHKL, id=G2G.wxID_PWD3DHKLPLOT)
         G2frame.dataWindow.SelectPhase.Enable(False)
     else:
         G2frame.Bind(wx.EVT_MENU, OnSelectPhase, id=G2G.wxID_SELECTPHASE)
+        G2frame.Bind(wx.EVT_MENU, OnPlot1DHKL, id=G2G.wxID_1DHKLSTICKPLOT)
         G2frame.Bind(wx.EVT_MENU, OnPlotHKL, id=G2G.wxID_PWDHKLPLOT)
         G2frame.Bind(wx.EVT_MENU, OnPlot3DHKL, id=G2G.wxID_PWD3DHKLPLOT)