Changeset 4806 for trunk

Timestamp:

Feb 8, 2021 3:32:39 PM (2 years ago)

Author:

vondreele

Message:

remove bigSizer from UpdatePWHKPlot - use mainSizer = vertical box sizer. Fixed bug in UpdateLimits? where GUI got wrong sizer shape. BHT fix might make this go away?
Implement new PWDR plot command 'X' to show/hide excluded data, etc. Uses masks.

Location:

trunk

Files:

• GSASIIdataGUI.py (modified) (3 diffs)
• GSASIIplot.py (modified) (6 diffs)

trunk/GSASIIdataGUI.py

@@ -8525 +8525 @@
         G2frame.dataWindow.ClearData()
     #G2frame.dataWindow.GetSizer() # don't use this since may be wx.HORIZONTAL or wx.VERTICAL
-    bigSizer = wx.BoxSizer(wx.HORIZONTAL)
     mainSizer = wx.BoxSizer(wx.VERTICAL)
     mainSizer.Add((5,5),)
     wtSizer = wx.BoxSizer(wx.HORIZONTAL)
+    wtSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=G2frame.dataWindow.helpKey))
     wtSizer.Add(wx.StaticText(G2frame.dataWindow,-1,' Weight factor: '),0,WACV)
     wtSizer.Add(G2G.ValidatedTxtCtrl(G2frame.dataWindow,data[0],'wtFactor',nDig=(10,3),xmin=1.e-9),0,WACV)
@@ -8539 +8539 @@
 #        comp.Bind(wx.EVT_COMBOBOX, OnCompression)
 #        wtSizer.Add(comp,0,WACV)
+
     mainSizer.Add(wtSizer)
     wtSizer = wx.BoxSizer(wx.HORIZONTAL)
@@ -8638 +8639 @@
         mainSizer.Add(mSizer)
         
-    bigSizer.Add(mainSizer)    
-    bigSizer.Add(G2G.HelpButton(G2frame.dataWindow,helpIndex=kind))
-    G2frame.dataWindow.SetSizer(bigSizer)
+    G2frame.dataWindow.SetSizer(mainSizer)
     
     G2frame.GPXtree.SetItemPyData(item,data)

trunk/GSASIIplot.py

@@ -321 +321 @@
         self.toolbar = GSASIItoolbar(self.canvas,publish=publish)
         self.toolbar.Realize()
-        self.plotStyle = {'qPlot':False,'dPlot':False,'sqrtPlot':False,'sqPlot':False,'logPlot':False}
+        self.plotStyle = {'qPlot':False,'dPlot':False,'sqrtPlot':False,'sqPlot':False,'logPlot':False,'exclude':False}
         
         sizer=wx.BoxSizer(wx.VERTICAL)
@@ -1779 +1779 @@
         elif event.key == 'e' and plottype in ['SASD','REFD']:
             G2frame.ErrorBars = not G2frame.ErrorBars
+        elif event.key == 'x'and 'PWDR' in plottype:
+            Page.plotStyle['exclude'] = not Page.plotStyle['exclude']
         elif event.key == '.':
             Page.plotStyle['WgtDiagnostic'] = not Page.plotStyle.get('WgtDiagnostic',False)
@@ -2863 +2865 @@
             Page.Choice = [' key press',
                 'a: add magnification region','b: toggle subtract background',
-                'c: contour on','g: toggle grid','m: toggle multidata plot',
-                'n: toggle log(I)',]
+                'c: contour on','x: toggle excluded regions','g: toggle grid',
+                'm: toggle multidata plot','n: toggle log(I)',]
             if obsInCaption:
                 Page.Choice += ['o: remove obs, calc,... from legend',]
@@ -3149 +3151 @@
             else:
                 Y = xye[1]*Sample['Scale'][0]*(1.05)**NoffY
+        if Page.plotStyle['exclude']:
+            Y = ma.array(Y,mask=ma.getmask(X))
+                
         if LimitId and ifpicked:
             limits = np.array(G2frame.GPXtree.GetItemPyData(LimitId))
@@ -3252 +3257 @@
                 BackLine = None
                 DifLine = [None]
+                if 'PWDR' in plottype and Page.plotStyle['exclude']:
+                    Emask = ma.getmask(ma.masked_less_equal(xye[3],0.))
+                    Xum = ma.array(Xum,mask=Emask)
+                    X = ma.array(X,mask=Emask)
+                    Y = ma.array(Y,mask=Emask)
+                    Z = ma.array(Z,mask=Emask)
+                    W = ma.array(W,mask=Emask)
+
                 if G2frame.Weight:
                     Plot1.set_yscale("linear")                                                  
@@ -3259 +3272 @@
                     else:
                         DZ = (xye[1]-xye[3])*np.sqrt(wtFactor*xye[2])
+                        if Page.plotStyle['exclude']:
+                            DZ = ma.array(DZ,mask=Emask)
                     DifLine = Plot1.plot(X,DZ,colors[3],
                         picker=True,pickradius=1.,label=incCptn('diff'))                    #(Io-Ic)/sig(Io)
                     Plot1.axhline(0.,color='k')
-
+                    
                 if Page.plotStyle['logPlot']:
                     if 'PWDR' in plottype: