Changeset 1800 for trunk/GSASIIphsGUI.py

Timestamp:

Apr 21, 2015 12:16:53 PM (8 years ago)

Author:

vondreele

Message:

show no. space group extinct reflections in HKLF data - rejected from calcs.
calculate a "residual" for texture fitting & show it in ProgressBar?
correct angle derivatives in texture fitting (wrong sign)
trap empty useList in plots
make sure U23 is printed in lst output

File:

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

trunk/GSASIIphsGUI.py

@@ -711 +711 @@
             def OnRefList(event):
                 dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select reflection sets to use',
-                    'Use data',refsList,filterBox=False)
+                    'Use data',refsList)
                 try:
                     if dlg.ShowModal() == wx.ID_OK:
@@ -782 +782 @@
             def OnRefList(event):
                 dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select reflection sets to use',
-                    'Use data',refsList,filterBox=False)
+                    'Use data',refsList)
                 try:
                     if dlg.ShowModal() == wx.ID_OK:
@@ -2228 +2228 @@
             def OnRefList(event):
                 dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select reflection sets to use',
-                    'Use data',refsList,filterBox=False)
+                    'Use data',refsList)
                 try:
                     if dlg.ShowModal() == wx.ID_OK:
@@ -3752 +3752 @@
                 TextList.append(name)
             item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)                        
-        dlg = wx.MultiChoiceDialog(G2frame, 'Which new data to use?', 'Use data', TextList, wx.CHOICEDLG_STYLE)
+        dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select reflection sets to use',
+                    'Use data',TextList)
         try:
             if dlg.ShowModal() == wx.ID_OK:
@@ -3936 +3937 @@
         NDij = len(G2spc.HStrainNames(SGData))
         keyList = UseList.keys()
-        TextList = ['All PWDR']
+        TextList = []
         if G2frame.PatternTree.GetCount():
             item, cookie = G2frame.PatternTree.GetFirstChild(G2frame.root)
@@ -3944 +3945 @@
                     TextList.append(name)
                 item, cookie = G2frame.PatternTree.GetNextChild(G2frame.root, cookie)
-            dlg = wx.MultiChoiceDialog(G2frame, 'Which new data to use?', 'Use data', TextList, wx.CHOICEDLG_STYLE)
+            dlg = G2G.G2MultiChoiceDialog(G2frame, 'Select reflection sets to use',
+                    'Use data',TextList)
             try:
                 if dlg.ShowModal() == wx.ID_OK:
@@ -5923 +5925 @@
                 else:   # xray - typical caked 2D image data
                     refData[name] = np.column_stack((Refs[0],Refs[1],Refs[2],Refs[5+im],Refs[8+im],Refs[12+im+it],np.zeros_like(Refs[0])))
-        Error = G2mth.FitTexture(General,Gangls,refData,keyList)
+        pgbar = wx.ProgressDialog('Texture fit','Residual = %5.2f'%(101.0),101.0, 
+            style = wx.PD_ELAPSED_TIME|wx.PD_AUTO_HIDE)
+        Error = G2mth.FitTexture(General,Gangls,refData,keyList,pgbar)
+        pgbar.Destroy()
         if Error:
             wx.MessageBox(Error,caption='Fit Texture Error',style=wx.ICON_EXCLAMATION)
@@ -5977 +5982 @@
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.DataMenu)
             G2ddG.UpdateDData(G2frame,DData,data)
-            G2plt.PlotSizeStrainPO(G2frame,data,hist='',Start=True)            
+            wx.CallAfter(G2plt.PlotSizeStrainPO,G2frame,data,hist='',Start=True)            
         elif text == 'Atoms':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.AtomsMenu)
@@ -6007 +6012 @@
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.TextureMenu)
             UpdateTexture()                        
-            G2plt.PlotTexture(G2frame,data,Start=True)            
+            wx.CallAfter(G2plt.PlotTexture,G2frame,data,Start=True)            
         elif text == 'Pawley reflections':
             G2gd.SetDataMenuBar(G2frame,G2frame.dataFrame.PawleyMenu)
@@ -6013 +6018 @@
         else:
             G2gd.SetDataMenuBar(G2frame)
+            
     def FillMenus():
         '''Create the Select tab menus and bind to all menu items