Changeset 4032 for trunk/GSASIIplot.py

Timestamp:

Jun 19, 2019 4:13:00 PM (4 years ago)

Author:

vondreele

Message:

fix 'Resolution' in old gpx to 'GridStep?'
fix to bad logical operator in MakeFrameMask?
apply polarization pixel by pixel in integration; then put back on for azm=0 for powder diffraction
remove a wasted busycursor
add Xlines & Ylines to masks to mask whole row/columns of pixels (not quite complete)
make picktype = None for unknown picks ('?' causes crash)

File:

• trunk/GSASIIplot.py (modified) (8 diffs)

trunk/GSASIIplot.py

@@ -6531 +6531 @@
         Page.figure.suptitle('Left-click to create an arc mask',color='r',fontweight='bold')
         Page.canvas.draw()
+    elif G2frame.MaskKey == 'x':
+        new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('2D Powder Image','mpl',newImage=False)
+        Page.figure.suptitle('Left-click to create an x-line mask',color='r',fontweight='bold')
+        Page.canvas.draw()
+    elif G2frame.MaskKey == 'y':
+        new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('2D Powder Image','mpl',newImage=False)
+        Page.figure.suptitle('Left-click to create an y-line mask',color='r',fontweight='bold')
+        Page.canvas.draw()
     elif G2frame.MaskKey == 'r':
         new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('2D Powder Image','mpl',newImage=False)
@@ -6746 +6754 @@
                 Page.canvas.draw()
                 return 
-            elif event.key in ['l','p','f','a','r']:
+            elif event.key in ['l','p','f','a','r','x','y']:
                 G2frame.MaskKey = event.key
                 OnStartMask(G2frame)
@@ -6922 +6930 @@
                 pickType = pick.itemType
             except:
-                pickType = '?'
+                pickType = None
             if pickType == "Spot":
                 itemNum = G2frame.itemPicked.itemNumber
@@ -7059 +7067 @@
                 pickType = pick.itemType
             except: # should not happen anymore
-                pickType = '?'
+                pickType = None
             if pickType == 'Spot':
                 pl = [pick,]
@@ -7198 +7206 @@
                 wx.CallAfter(PlotImage,G2frame,newImage=True)
                 return
-            elif G2frame.MaskKey =='p' or G2frame.MaskKey =='f':
+            elif G2frame.MaskKey in ['p','f']:
                 if G2frame.MaskKey =='p':
                     polygon = Masks['Polygons'][-1]
@@ -7232 +7240 @@
                     #G2imG.UpdateMasks(G2frame,Masks)
                     return
+            elif G2frame.MaskKey in ['x','y']:
+                Xpix,Ypix = int(Xpos*scalex),int(Ypos*scaley)
+                if G2frame.MaskKey == 'y':
+                    Masks['Ylines'].append(Xpix)
+                else:
+                    Masks['Xlines'].append(Ypix)
+                G2imG.UpdateMasks(G2frame,Masks)
+                wx.CallAfter(PlotImage,G2frame,newImage=True)
+                return
             G2imG.UpdateMasks(G2frame,Masks)
             wx.CallAfter(PlotImage,G2frame,newImage=False)
@@ -7378 +7395 @@
         elif G2frame.GPXtree.GetItemText(G2frame.PickId) in ['Masks',]:
             Page.Choice = [' key press','a: arc mask','r: ring mask',
+                'x: x line mask','y: y line mask',
                 'p: polygon mask','f: frame mask',
                 't: add spot mask at mouse position',
@@ -7414 +7432 @@
             Imin,Imax = Data['range'][1]
             MA = ma.masked_greater(ma.masked_less(G2frame.ImageZ,Zlim[0]),Zlim[1])
+            
             MaskA = ma.getmaskarray(MA)
             A = G2img.ImageCompress(MA,imScale)