Changeset 2618
- Timestamp:
- Jan 9, 2017 3:53:35 PM (6 years ago)
- Location:
- trunk
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/GSASII.py
r2615 r2618 2411 2411 self.ifGetRing = False 2412 2412 self.MaskKey = '' #trigger for making image masks 2413 self.MskDelete = False #trigger for mask delete 2413 2414 self.StrainKey = '' #ditto for new strain d-zeros 2414 2415 self.EnablePlot = True -
trunk/GSASIIimage.py
r2616 r2618 1149 1149 peaks = jndx*pixelSize/1000. 1150 1150 tth = GetTth(peaks.T[0],peaks.T[1],Controls) 1151 histtth,bins = np.histogram(tth,2500) 1152 1153 #should be able to filter out spotty Bragg rings here 1151 1154 Peakarray = np.vstack((tth,peaks.T)).T 1152 1155 Peakarray = np.array(G2mth.sortArray(Peakarray,0)) #now in 2theta … … 1154 1157 txt = 'More than 100 spots found: %d. Are rings spotty?'%(len(jndx)) 1155 1158 return txt 1156 #should be able to filter out spotty Bragg rings here1157 1159 Points = np.ones((peaks.shape[0],3)) 1158 1160 Points[:,:2] = Peakarray[:,1:] -
trunk/GSASIIimgGUI.py
r2616 r2618 1303 1303 def OnAutoSpotMask(event): 1304 1304 'Do auto search for spot masks' 1305 wx.MessageDialog(G2frame.dataDisplay,'NB: This will clear any old spot masks','Auto Spot Masks', wx.OK).ShowModal()1306 Controls = copy.deepcopy(G2frame.PatternTree.GetItemPyData(1307 G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Image Controls')))1308 Error = G2img.AutoSpotMasks(G2frame.ImageZ,data,Controls)1309 if not Error is None:1310 G2frame.ErrorDialog('Auto spot search error',Error)1311 wx.CallAfter(UpdateMasks,G2frame,data)1312 wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event)1305 if wx.MessageDialog(G2frame.dataDisplay,'NB: This will clear any old spot masks','Auto Spot Masks', wx.OK|wx.CANCEL).ShowModal() == wx.ID_OK: 1306 Controls = copy.deepcopy(G2frame.PatternTree.GetItemPyData( 1307 G2gd.GetPatternTreeItemId(G2frame,G2frame.PatternId,'Image Controls'))) 1308 Error = G2img.AutoSpotMasks(G2frame.ImageZ,data,Controls) 1309 if not Error is None: 1310 G2frame.ErrorDialog('Auto spot search error',Error) 1311 wx.CallAfter(UpdateMasks,G2frame,data) 1312 wx.CallAfter(G2plt.PlotExposedImage,G2frame,event=event) 1313 1313 1314 1314 def ToggleSpotMaskMode(event): -
trunk/GSASIIplot.py
r2616 r2618 4140 4140 Page.figure.suptitle('Left-click to create a ring mask',color='r',fontweight='bold') 4141 4141 Page.canvas.draw() 4142 elif G2frame.MskDelete: 4143 new,plotNum,Page,Plot,lim = G2frame.G2plotNB.FindPlotTab('2D Powder Image','mpl',newImage=False) 4144 Page.figure.suptitle('select spot mask to delete',color='r',fontweight='bold') 4145 Page.canvas.draw() 4146 4142 4147 G2imG.UpdateMasks(G2frame,Masks) 4143 4148 … … 4308 4313 elif event.key in ['l','p','f','a','r']: 4309 4314 G2frame.MaskKey = event.key 4315 OnStartMask(G2frame) 4316 elif event.key == 'd': 4317 G2frame.MskDelete = True 4310 4318 OnStartMask(G2frame) 4311 4319 … … 4577 4585 print('picktype {} should not happen!'.format(pickType)) 4578 4586 GSASIIpath.IPyBreak() 4579 if event.mouseevent.button == 3: 4580 if pickType == 'Spot': 4581 print 'delete',pick.center 4582 del Masks['Points'][pick.itemNumber] 4583 4584 Page.canvas.draw() # refresh without dotted line & save bitmap 4585 else: 4586 saveLinestyle = [p.get_linestyle() for p in pl] 4587 for p in pl: p.set_linestyle('dotted') # set line as dotted 4588 Page.canvas.draw() # refresh without dotted line & save bitmap 4589 savedplot = Page.canvas.copy_from_bbox(Page.figure.gca().bbox) 4590 G2frame.cid = Page.canvas.mpl_connect('motion_notify_event', OnDragMask) 4591 for p,s in zip(pl,saveLinestyle): p.set_linestyle(s) # set back to original 4587 saveLinestyle = [p.get_linestyle() for p in pl] 4588 for p in pl: p.set_linestyle('dotted') # set line as dotted 4589 Page.canvas.draw() # refresh without dotted line & save bitmap 4590 savedplot = Page.canvas.copy_from_bbox(Page.figure.gca().bbox) 4591 G2frame.cid = Page.canvas.mpl_connect('motion_notify_event', OnDragMask) 4592 for p,s in zip(pl,saveLinestyle): p.set_linestyle(s) # set back to original 4592 4593 4593 4594 def OnImRelease(event): … … 4723 4724 G2imG.UpdateMasks(G2frame,Masks) 4724 4725 wx.CallAfter(PlotImage,G2frame,newImage=False) 4726 elif G2frame.MskDelete: 4727 G2frame.MskDelete = False 4728 if G2frame.itemPicked: 4729 del Masks['Points'][G2frame.itemPicked.itemNumber] 4730 G2imG.UpdateMasks(G2frame,Masks) 4731 wx.CallAfter(PlotImage,G2frame,newImage=True) 4725 4732 elif treeItem == 'Stress/Strain' and G2frame.StrainKey: 4726 4733 Xpos,Ypos = [event.xdata,event.ydata] … … 4838 4845 Page.Choice = [' key press','l: log(I) on','a: arc mask','r: ring mask', 4839 4846 'p: polygon mask','f: frame mask', 4840 't: add spot mask at mouse position'] 4847 't: add spot mask at mouse position', 4848 'd: select spot mask to delete with mouse'] 4841 4849 Page.Choice.append('s: start multiple spot mask mode') # this must be the last choice 4842 4850 if G2frame.logPlot:
Note: See TracChangeset
for help on using the changeset viewer.