Changeset 4847 for trunk/GSASIIdataGUI.py

Timestamp:

Mar 9, 2021 8:34:13 AM (9 months ago)

Author:

vondreele

Message:

Add (TBD) hide/showtoggle for single crystal systematic extinctions in Reflection list
fix conversion of Uiso to Uij when Uij == 0
fix SHELX 4 reader

File:

• trunk/GSASIIdataGUI.py (modified) (7 diffs)

trunk/GSASIIdataGUI.py

@@ -5595 +5595 @@
 
     def __init__(self,parent):
-#        wxscroll.ScrolledPanel.__init__(self,parent,wx.ID_ANY,size=parent.GetSize())
         wx.ScrolledWindow.__init__(self,parent,wx.ID_ANY,size=parent.GetSize())
         self.parent = parent
@@ -6081 +6080 @@
         
         # PDR / Reflection Lists
-        G2G.Define_wxId('wxID_SELECTPHASE', ) #some wxIDs defined above in PWDR & SASD
+        G2G.Define_wxId('wxID_SELECTPHASE','wxID_SHOWHIDEEXTINCT' ) #some wxIDs defined above in PWDR & SASD
         self.ReflMenu = wx.MenuBar()
         self.PrefillDataMenu(self.ReflMenu)
@@ -6090 +6089 @@
         self.ReflEdit.Append(G2G.wxID_PWDHKLPLOT,'Plot HKLs','Plot HKLs in 2D')
         self.ReflEdit.Append(G2G.wxID_PWD3DHKLPLOT,'Plot 3D HKLs','Plot HKLs in 3D')
+        self.HideShow = self.ReflEdit.Append(G2G.wxID_SHOWHIDEEXTINCT,'Show/hide extinct reflections')
         self.PostfillDataMenu()
         
@@ -6999 +6999 @@
             'Scale':1.0,'oldxy':[],'viewDir':[1,0,0]},'Super':Super,'SuperVec':SuperVec}
         G2plt.Plot3DSngl(G2frame,newPlot=True,Data=controls,hklRef=refList,Title=phaseName)
+        
+    def OnToggleExt(event):
+        print('TBD')
                   
     def OnMergeHKL(event):
@@ -7208 +7211 @@
             ' Data residual wR: %.3f%% on %d observations'%(data[0]['wR'],data[0]['Nobs'])))
         if kind == 'PWDR':
-            mainSizer.Add(wx.StaticText(G2frame.dataWindow,-1,
-                ' Durbin-Watson statistic: %.3f'%(data[0].get('Durbin-Watson',0.))))
+            DBW = ma.getdata(data[0]['Durbin-Watson'])
+            mainSizer.Add(wx.StaticText(G2frame.dataWindow,label=' Durbin-Watson statistic: %.3f'%DBW))
         for value in data[0]:
             if 'Nref' in value:
@@ -7716 +7719 @@
             G2plt.PlotPatterns(G2frame)
     elif G2frame.GPXtree.GetItemText(item) == 'Reflection Lists':   #powder reflections
+        G2frame.dataWindow.HideShow.Enable(False)
         G2frame.PatternId = G2frame.GPXtree.GetItemParent(item)
         data = G2frame.GPXtree.GetItemPyData(item)
@@ -7724 +7728 @@
         G2plt.PlotPatterns(G2frame)
     elif G2frame.GPXtree.GetItemText(item) == 'Reflection List':    #HKLF reflections
+        G2frame.dataWindow.HideShow.Enable(True)
         G2frame.PatternId = G2frame.GPXtree.GetItemParent(item)
         name = G2frame.GPXtree.GetItemText(G2frame.PatternId)