Changeset 4848 for trunk

Timestamp:

Mar 9, 2021 12:43:26 PM (2 years ago)

Author:

vondreele

Message:

implement the show/hide systematic absences in single crystal Reflection List
Add 'P' & 'M' for increment/decrement zone layer olot in 3D hkl plots; no 'N' command. Add these to key box menu

Location:

trunk

Files:

• GSASIIplot.py (modified) (7 diffs)
• GSASIIpwdGUI.py (modified) (4 diffs)

trunk/GSASIIplot.py

@@ -362 +362 @@
         sizer.Add(self.canvas,1,wx.EXPAND)
         self.SetSizer(sizer)
+        
+    def SetToolTipString(self,text):
+        if 'phoenix' in wx.version():
+            self.canvas.SetToolTip(wx.ToolTip(text))
+        else:
+            self.canvas.SetToolTipString(text)
+            
         
 class G2Plot3D(_tabPlotWin):
@@ -1099 +1106 @@
 def PlotSngl(G2frame,newPlot=False,Data=None,hklRef=None,Title=''):
     '''Structure factor plotting package - displays zone of reflections as rings proportional
-        to F, F**2, etc. as requested
+        to F, F**2, etc. as requested via matpltlib; plots are not geometrically correct
     '''
     from matplotlib.patches import Circle
@@ -1446 +1453 @@
 ##### Plot3DSngl ################################################################################
 def Plot3DSngl(G2frame,newPlot=False,Data=None,hklRef=None,Title=False):
-    '''3D Structure factor plotting package - displays reflections as rings proportional
-        to F, F**2, etc. as requested as 3D array
+    '''3D Structure factor plotting package - displays reflections as spots proportional
+        to F, F**2, etc. as requested as 3D array via pyOpenGl
     '''
     global ifBox
@@ -1538 +1545 @@
         elif key == 'P':
             vec = viewChoice[Data['viewKey']][0]
+            drawingData['viewPoint'][0] += vec
+        elif key == 'M':
+            vec = viewChoice[Data['viewKey']][0]
             drawingData['viewPoint'][0] -= vec
-        elif key == 'N':
-            vec = viewChoice[Data['viewKey']][0]
-            drawingData['viewPoint'][0] += vec
         elif key == '0':
             drawingData['viewPoint'][0] = np.array([0,0,0])
@@ -1848 +1855 @@
         Zclip = drawingData['Zclip']*cPos/20.
         if Data['Zone']:
-            Zclip = 0.01
+            Zclip = 0.002
         Q = drawingData['Quaternion']
         Tx,Ty,Tz = drawingData['viewPoint'][0][:3]
@@ -1858 +1865 @@
         
         HKL,RC,RF,RF2 = FillHKLRC()
-        G2frame.G2plotNB.status.SetStatusText   \
-            ('Plot type = %s for %s; RF = %6.2f%%, RF%s = %6.2f%%'%(Data['Type'],Name,RF,super2,RF2),1)
+        if Data['Zone']:
+            G2frame.G2plotNB.status.SetStatusText   \
+                ('Plot type = %s for %s; RF = %6.2f%%, RF%s = %6.2f%% layer %s'%    \
+                (Data['Type'],Name,RF,super2,RF2,str(list(drawingData['viewPoint'][0]))),1)            
+        else:
+            G2frame.G2plotNB.status.SetStatusText   \
+                ('Plot type = %s for %s; RF = %6.2f%%, RF%s = %6.2f%%'%(Data['Type'],Name,RF,super2,RF2),1)
         
         SetBackground()
@@ -1899 +1911 @@
     Page.Choice = None
     choice = [' save as/key:','jpeg','tiff','bmp','h: view down h','k: view down k','l: view down l',
-    'z: zero zone toggle','c: reset to default','o: set view point = 0,0,0','b: toggle box ','+: increase scale','-: decrease scale',
+    'z: zero zone toggle','p: increment layer','m: decrement layer','c: reset to default','o: set view point = 0,0,0','b: toggle box ','+: increase scale','-: decrease scale',
     'f: Fobs','s: Fobs**2','u: unit','d: Fo-Fc','w: DF/sig','i: toggle intensity scaling']
     cb = wx.ComboBox(G2frame.G2plotNB.status,style=wx.CB_DROPDOWN|wx.CB_READONLY,choices=choice,

trunk/GSASIIpwdGUI.py

@@ -4745 +4745 @@
     Controls = G2frame.GPXtree.GetItemPyData(G2gd.GetGPXtreeItemId(G2frame,G2frame.root, 'Controls'))
     dMin = 0.05
+    if not isinstance(G2frame.Hide, bool):
+        G2frame.Hide = False
     if 'UsrReject' in Controls:
         dMin = Controls['UsrReject'].get('MinD',0.05)
@@ -4853 +4855 @@
         rowLabels = []
         if HKLF:
-            refList = data[1]['RefList']
+            if G2frame.Hide:
+                refList = np.array([refl for refl in data[1]['RefList'] if refl[3]])
+            else:
+                refList = data[1]['RefList']
             refs = refList
         else:
@@ -4955 +4960 @@
             setBackgroundColors(im,itof)
         if HKLF:
-            refList = np.array([refl[:6+im] for refl in data[1]['RefList']])
+            if G2frame.Hide:
+                refList = np.array([refl[:6+im] for refl in data[1]['RefList'] if refl[3]])
+            else:
+                refList = np.array([refl[:6+im] for refl in data[1]['RefList']])
         else:
             refList = np.array([refl[:6+im] for refl in data[phaseName]['RefList']])
@@ -4970 +4978 @@
         
     def OnToggleExt(event):
-        print('TBD')
+        G2frame.Hide = not G2frame.Hide
+        UpdateReflectionGrid(G2frame,data,HKLF=True,Name=Name)
                   
     def OnPageChanged(event):