Changeset 2618

Timestamp:

Jan 9, 2017 3:53:35 PM (6 years ago)

Author:

vondreele

Message:

implement spot mask delete from image command (also fix spot move & resize with mouse)

Location:

trunk

Files:

• GSASII.py (modified) (1 diff)
• GSASIIimage.py (modified) (2 diffs)
• GSASIIimgGUI.py (modified) (1 diff)
• GSASIIplot.py (modified) (5 diffs)

trunk/GSASII.py

@@ -2411 +2411 @@
         self.ifGetRing = False
         self.MaskKey = ''           #trigger for making image masks
+        self.MskDelete = False      #trigger for mask delete
         self.StrainKey = ''         #ditto for new strain d-zeros
         self.EnablePlot = True

trunk/GSASIIimage.py

@@ -1149 +1149 @@
     peaks = jndx*pixelSize/1000.
     tth = GetTth(peaks.T[0],peaks.T[1],Controls)
+    histtth,bins = np.histogram(tth,2500)
+    
+    #should be able to filter out spotty Bragg rings here
     Peakarray = np.vstack((tth,peaks.T)).T
     Peakarray = np.array(G2mth.sortArray(Peakarray,0))  #now in 2theta 
@@ -1154 +1157 @@
         txt = 'More than 100 spots found: %d. Are rings spotty?'%(len(jndx))
         return txt
-    #should be able to filter out spotty Bragg rings here
     Points = np.ones((peaks.shape[0],3))
     Points[:,:2] = Peakarray[:,1:]

trunk/GSASIIimgGUI.py

@@ -1303 +1303 @@
     def OnAutoSpotMask(event):
         'Do auto search for spot masks'
-        wx.MessageDialog(G2frame.dataDisplay,'NB: This will clear any old spot masks','Auto Spot Masks', wx.OK).ShowModal()
-        Controls = copy.deepcopy(G2frame.PatternTree.GetItemPyData( 
-        G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Image Controls')))
-        Error = G2img.AutoSpotMasks(G2frame.ImageZ,data,Controls)
-        if not Error is None:
-            G2frame.ErrorDialog('Auto spot search error',Error)
-        wx.CallAfter(UpdateMasks,G2frame,data)
-        wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event)                
+        if wx.MessageDialog(G2frame.dataDisplay,'NB: This will clear any old spot masks','Auto Spot Masks', wx.OK|wx.CANCEL).ShowModal() == wx.ID_OK:
+            Controls = copy.deepcopy(G2frame.PatternTree.GetItemPyData( 
+            G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Image Controls')))
+            Error = G2img.AutoSpotMasks(G2frame.ImageZ,data,Controls)
+            if not Error is None:
+                G2frame.ErrorDialog('Auto spot search error',Error)
+            wx.CallAfter(UpdateMasks,G2frame,data)
+            wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event)                
             
     def ToggleSpotMaskMode(event):

trunk/GSASIIplot.py

@@ -4140 +4140 @@
         Page.figure.suptitle('Left-click to create a ring mask',color='r',fontweight='bold')
         Page.canvas.draw()
+    elif G2frame.MskDelete:
+        new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('2D Powder Image','mpl',newImage=False)
+        Page.figure.suptitle('select spot mask to delete',color='r',fontweight='bold')
+        Page.canvas.draw()
+
     G2imG.UpdateMasks(G2frame,Masks)
     
@@ -4308 +4313 @@
             elif event.key in ['l','p','f','a','r']:
                 G2frame.MaskKey = event.key
+                OnStartMask(G2frame)
+            elif event.key == 'd':
+                G2frame.MskDelete = True
                 OnStartMask(G2frame)
                 
@@ -4577 +4585 @@
                 print('picktype {} should not happen!'.format(pickType))
                 GSASIIpath.IPyBreak()
-            if event.mouseevent.button == 3:
-                if pickType == 'Spot':
-                    print 'delete',pick.center
-                    del Masks['Points'][pick.itemNumber]
-                    
-                    Page.canvas.draw() # refresh without dotted line & save bitmap
-            else:
-                saveLinestyle = [p.get_linestyle() for p in pl]
-                for p in pl: p.set_linestyle('dotted') # set line as dotted
-                Page.canvas.draw() # refresh without dotted line & save bitmap
-                savedplot = Page.canvas.copy_from_bbox(Page.figure.gca().bbox)
-                G2frame.cid = Page.canvas.mpl_connect('motion_notify_event', OnDragMask)
-                for p,s in zip(pl,saveLinestyle): p.set_linestyle(s) # set back to original
+            saveLinestyle = [p.get_linestyle() for p in pl]
+            for p in pl: p.set_linestyle('dotted') # set line as dotted
+            Page.canvas.draw() # refresh without dotted line & save bitmap
+            savedplot = Page.canvas.copy_from_bbox(Page.figure.gca().bbox)
+            G2frame.cid = Page.canvas.mpl_connect('motion_notify_event', OnDragMask)
+            for p,s in zip(pl,saveLinestyle): p.set_linestyle(s) # set back to original
 
     def OnImRelease(event):
@@ -4723 +4724 @@
             G2imG.UpdateMasks(G2frame,Masks)
             wx.CallAfter(PlotImage,G2frame,newImage=False)
+        elif G2frame.MskDelete:
+            G2frame.MskDelete = False
+            if G2frame.itemPicked:
+                del Masks['Points'][G2frame.itemPicked.itemNumber]
+            G2imG.UpdateMasks(G2frame,Masks)
+            wx.CallAfter(PlotImage,G2frame,newImage=True)
         elif treeItem == 'Stress/Strain' and G2frame.StrainKey:
             Xpos,Ypos = [event.xdata,event.ydata]
@@ -4838 +4845 @@
             Page.Choice = [' key press','l: log(I) on','a: arc mask','r: ring mask',
                 'p: polygon mask','f: frame mask',
-                't: add spot mask at mouse position']
+                't: add spot mask at mouse position',
+                'd: select spot mask to delete with mouse']
             Page.Choice.append('s: start multiple spot mask mode') # this must be the last choice
             if G2frame.logPlot: