Changeset 3154 for trunk/GSASIIplot.py

Timestamp:

Nov 18, 2017 6:14:55 PM (5 years ago)

Author:

vondreele

Message:

new & imporved spot mask routines:
manual spot mask now fits position & size for selected spot.
changed mouse controls LB drag moves spot, shift-LB changes size & RB deletes spot
autospotmask improved - new algorithm

File:

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

trunk/GSASIIplot.py

@@ -4613 +4613 @@
     if G2frame.MaskKey == 's':
         Page.figure.suptitle('Multiple spot mode on (size={}), press s or right-click to end'
-                             .format(G2frame.spotSize),color='r',fontweight='bold')
+            .format(G2frame.spotSize),color='r',fontweight='bold')
     else:
         Page.figure.suptitle('New spot size={}'.format(G2frame.spotSize),
@@ -4666 +4666 @@
     from matplotlib.patches import Ellipse,Circle
     import numpy.ma as ma
+    G2frame.ShiftDown = False
     G2frame.cid = None
     #Dsp = lambda tth,wave: wave/(2.*npsind(tth/2.))
@@ -4729 +4730 @@
                      G2frame.G2plotNB.status.SetStatusText( \
                         'Radius=%.3fmm, 2-th=%.3fdeg, dsp=%.3fA, Q=%.5fA-1, azm=%.2fdeg, I=%6d'%(radius,tth,dsp,Q,azm,Int),1)
+
+    def OnImPlotKeyRelease(event):
+        if event.key == 'shift':
+            G2frame.ShiftDown = False
 
     def OnImPlotKeyPress(event):
@@ -4784 +4789 @@
                 G2frame.MskDelete = True
                 OnStartMask(G2frame)
+            elif event.key == 'shift':
+                G2frame.ShiftDown = True
                 
         elif treeItem == 'Stress/Strain':
@@ -4908 +4915 @@
                 itemNum = G2frame.itemPicked.itemNumber
                 if event.button == 1:
-                    x = Masks['Points'][itemNum][0]+Xpos-XposBeforeDrag
-                    y = Masks['Points'][itemNum][1]+Ypos-YposBeforeDrag
-                    pick.center=[x,y]
-                elif event.button == 3:
-                    r = math.sqrt((Xpos-Masks['Points'][itemNum][0])**2+
-                              (Ypos-Masks['Points'][itemNum][1])**2)
-                    pick.radius = r
+                    if G2frame.ShiftDown:
+                        r = math.sqrt((Xpos-Masks['Points'][itemNum][0])**2+
+                                  (Ypos-Masks['Points'][itemNum][1])**2)
+                        pick.radius = r
+                    else:
+                        x = Masks['Points'][itemNum][0]+Xpos-XposBeforeDrag
+                        y = Masks['Points'][itemNum][1]+Ypos-YposBeforeDrag
+                        pick.center=[x,y]
                 Page.figure.gca().draw_artist(pick)
             elif pickType.startswith('Ring'):
@@ -5132 +5140 @@
                     ToggleMultiSpotMask(G2frame)
                 else:
-                    #TODO - try a fit of spot to image?
-                    spot = [Xpos,Ypos,G2frame.spotSize]
+                    if G2frame.ShiftDown:   #force user selection
+                        sig = G2frame.spotSize
+                    else:                   #optimize spot pick
+                        pixLimit = 5
+                        Xpix,Ypix = Xpos*scalex,Ypos*scaley
+                        Xpix,Ypix,I,J = G2img.ImageLocalMax(G2frame.ImageZ,pixLimit,Xpix,Ypix)
+                        ind = [int(Xpix),int(Ypix)]
+                        nxy = 15
+                        ImMax = np.max(G2frame.ImageZ)
+                        result = G2img.FitImageSpots(G2frame.ImageZ,ImMax,ind,pixelSize,nxy)
+                        if result:
+                            Xpos,Ypos,sig = result
+                        else:
+                            print ('Not a spot')
+                            return
+                    spot = [Xpos,Ypos,sig]
                     Masks['Points'].append(spot)
                     artist = Circle((Xpos,Ypos),radius=spot[2]/2,fc='none',ec='r',picker=3)
@@ -5142 +5164 @@
                     Page.canvas.draw()
                 return 
-            elif G2frame.MaskKey == 's':
-                if event.button == 1:
-                    spot = [Xpos,Ypos,G2frame.spotSize]
-                    Masks['Points'].append(spot)
-                    G2imG.UpdateMasks(G2frame,Masks)
-                G2frame.MaskKey = ''
-                wx.CallAfter(PlotImage,G2frame,newImage=True)
-                return
             elif G2frame.MaskKey == 'r':
                 if event.button == 1:
@@ -5274 +5288 @@
                 G2frame.Razim.SetValue(Data['LRazimuth'][1])
             elif pickType == "Spot" and treeItem == 'Masks':
+                spotnum = G2frame.itemPicked.itemNumber
                 if event.button == 1:
-                    spotnum = G2frame.itemPicked.itemNumber
-                    Masks['Points'][spotnum][0:2] = G2frame.itemPicked.center
+                    if G2frame.ShiftDown:
+                        Masks['Points'][spotnum] = list(G2frame.itemPicked.center) + [2.*G2frame.itemPicked.radius,]
+                    else:
+                    # update the selected circle mask with the last drawn values
+                        Masks['Points'][spotnum][0:2] = G2frame.itemPicked.center
                 elif event.button == 3:
-                    # update the selected circle mask with the last drawn values
-                    spotnum = G2frame.itemPicked.itemNumber
-                    Masks['Points'][spotnum] = list(G2frame.itemPicked.center) + [
-                        2.*G2frame.itemPicked.radius]
+                    del Masks['Points'][spotnum]
                 G2imG.UpdateMasks(G2frame,Masks)
             elif pickType.startswith('Ring') and treeItem == 'Masks':
@@ -5312 +5327 @@
     else:
         Page.canvas.mpl_connect('key_press_event', OnImPlotKeyPress)
+        Page.canvas.mpl_connect('key_release_event', OnImPlotKeyRelease)
         Page.canvas.mpl_connect('motion_notify_event', OnImMotion)
         Page.canvas.mpl_connect('pick_event', OnImPick)