Changeset 2175 for trunk/GSASIIphsGUI.py

Timestamp:

Mar 17, 2016 1:52:26 PM (8 years ago)

Author:

vondreele

Message:

modify DIFFaXDialog - more parameters
add selected are plot as a pylab plot

File:

• trunk/GSASIIphsGUI.py (modified) (3 diffs)

trunk/GSASIIphsGUI.py

@@ -2421 +2421 @@
             toler.SetValue('%.3f'%(Layers['Toler']))
             
+        def OnSadpPlot(event):
+            sadpPlot.SetValue(False)
+            import pylab as pl
+            pl.clf()
+            pl.imshow(Layers['Sadp']['Img'],aspect='equal')
+            pl.title(Layers['Sadp']['Plane'])
+            pl.show()
+            
         def CellSizer():
             
@@ -2816 +2824 @@
             toler.Bind(wx.EVT_KILL_FOCUS,OnToler)
             laueSizer.Add(toler,0,WACV)
+        if 'Sadp' in Layers:
+            sadpPlot = wx.CheckBox(layerData,label=' Plot selected area diffraction?')
+            sadpPlot.Bind(wx.EVT_CHECKBOX,OnSadpPlot)
+            laueSizer.Add(sadpPlot,0,WACV)
         topSizer.Add(laueSizer,0,WACV)
         topSizer.Add(wx.StaticText(layerData,label=' Reference unit cell for all layers:'),0,WACV)
@@ -2863 +2875 @@
         
     def OnSimulate(event):
-        UseList = []
-        for item in data['Histograms']:
-            if 'PWDR' in item:
-                UseList.append(item)
-        if not UseList:
-            wx.MessageBox('No PWDR data for this phase to simulate',caption='Data error',style=wx.ICON_EXCLAMATION)
-            return
-        dlg = wx.SingleChoiceDialog(G2frame,'Data to simulate','Select',UseList)
+        ctrls = ''
+        dlg = G2gd.DIFFaXcontrols(G2frame,ctrls)
         if dlg.ShowModal() == wx.ID_OK:
-            sel = dlg.GetSelection()
-            HistName = UseList[sel]
+            ctrls,plane = dlg.GetSelection()
+            data['Layers']['Sadp'] = {}
+            data['Layers']['Sadp']['Plane'] = plane
         else:
             return
-        dlg.Destroy()
-        PWDR = data['Histograms'][HistName]
-        G2frame.PatternId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,HistName)
-        sample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(
-            G2frame,G2frame.PatternId, 'Sample Parameters'))
-        scale = sample['Scale'][0]
-        background = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(
-            G2frame,G2frame.PatternId, 'Background'))        
-        limits = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(
-            G2frame,G2frame.PatternId, 'Limits'))[1]
-        inst = G2frame.PatternTree.GetItemPyData(
-            G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))[0]
-        if 'T' in inst['Type'][0]:
-            wx.MessageBox("Can't simulate neutron TOF patterns yet",caption='Data error',style=wx.ICON_EXCLAMATION)
-            return            
-        profile = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)[1]
-        ctrls = {}
-        dlg = G2gd.DIFFaXcontrols(G2frame,ctrls)
-        if dlg.ShowModal() == wx.ID_OK:
-            ctrls = dlg.GetSelection()
-        else:
-            return
-        dlg.Destroy()        
-        G2pwd.StackSim(data['Layers'],HistName,scale,background,limits,inst,profile)
-        G2plt.PlotPatterns(G2frame,plotType='PWDR')
+        if ctrls == '0\n0\n3\n':    #powder pattern
+            UseList = []
+            for item in data['Histograms']:
+                if 'PWDR' in item:
+                    UseList.append(item)
+            if not UseList:
+                wx.MessageBox('No PWDR data for this phase to simulate',caption='Data error',style=wx.ICON_EXCLAMATION)
+                return
+            dlg = wx.SingleChoiceDialog(G2frame,'Data to simulate','Select',UseList)
+            if dlg.ShowModal() == wx.ID_OK:
+                sel = dlg.GetSelection()
+                HistName = UseList[sel]
+            else:
+                return
+            dlg.Destroy()
+            PWDR = data['Histograms'][HistName]
+            G2frame.PatternId = G2gd.GetPatternTreeItemId(G2frame,G2frame.root,HistName)
+            sample = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(
+                G2frame,G2frame.PatternId, 'Sample Parameters'))
+            scale = sample['Scale'][0]
+            background = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(
+                G2frame,G2frame.PatternId, 'Background'))        
+            limits = G2frame.PatternTree.GetItemPyData(G2gd.GetPatternTreeItemId(
+                G2frame,G2frame.PatternId, 'Limits'))[1]
+            inst = G2frame.PatternTree.GetItemPyData(
+                G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId, 'Instrument Parameters'))[0]
+            if 'T' in inst['Type'][0]:
+                wx.MessageBox("Can't simulate neutron TOF patterns yet",caption='Data error',style=wx.ICON_EXCLAMATION)
+                return            
+            profile = G2frame.PatternTree.GetItemPyData(G2frame.PatternId)[1]
+            dlg.Destroy()        
+            G2pwd.StackSim(data['Layers'],ctrls,HistName,scale,background,limits,inst,profile)
+            G2plt.PlotPatterns(G2frame,plotType='PWDR')
+        else:   #selected area
+            G2pwd.StackSim(data['Layers'],ctrls)
+        wx.CallAfter(UpdateLayerData)
         
 ################################################################################