Changeset 87

Timestamp:

Jun 15, 2010 1:21:20 PM (15 years ago)

Author:

vondreel

Message:

"Spots" in Masks is really "Points"
Start of "points" for masks

Location:

trunk

Files:

• GSASII.py (modified) (2 diffs)
• GSASIIimage.py (modified) (4 diffs)
• GSASIIplot.py (modified) (17 diffs)

trunk/GSASII.py ¶

@@ -415 +415 @@
                         Data['range'] = [(Imin,Imax),[Imin,Imax]]
                         self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Image Controls'),Data)
-                        Masks = {'Spots':[],'Rings':[],'Arcs':[],'Polygons':[],'Thresholds':[(Imin,Imax),[Imin,Imax]]}
+                        Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Thresholds':[(Imin,Imax),[Imin,Imax]]}
                         self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Masks'),Masks)
                         self.PatternTree.SetItemPyData(Id,[Size,imagefile])
@@ -774 +774 @@
                             self.PatternTree.SelectItem(Id)
                             self.PatternTree.Expand(Id)
-                        Masks = {'Spots':[],'Rings':[],'Arcs':[],'Polygons':[],'Thresholds':[(Imin,Imax),[Imin,Imax]]}
+                        Masks = {'Points':[],'Rings':[],'Arcs':[],'Polygons':[],'Thresholds':[(Imin,Imax),[Imin,Imax]]}
                         self.PatternTree.SetItemPyData(self.PatternTree.AppendItem(Id,text='Masks'),Masks)
                         self.PickId = G2gd.GetPatternTreeItemId(self,self.root,outname)

trunk/GSASIIimage.py ¶

@@ -434 +434 @@
     return True
     
-def Make2ThetaAzimuthMap(data,imageN):
+def Make2ThetaAzimuthMap(data,masks,imageN):
     #transforms 2D image from x,y space to 2-theta,azimuth space based on detector orientation
     pixelSize = data['pixelSize']
@@ -442 +442 @@
     tax = np.asfarray(tax*scalex,dtype=np.float32)
     tay = np.asfarray(tay*scaley,dtype=np.float32)
-    return GetTthAzm(tay,tax,data)           #2-theta & azimuth arrays
+    #make position masks here
+    XY = np.dstack((tax,tay))
+    return GetTthAzm(tay,tax,data),0           #2-theta & azimuth arrays & position mask
 
-def Fill2ThetaAzimuthMap(masks,TA,image):
+def Fill2ThetaAzimuthMap(masks,TA,tam,image):
     import numpy.ma as ma
     Zlim = masks['Thresholds'][1]
@@ -481 +483 @@
         dlg.Update(0)
         imageN = len(self.ImageZ)
-        TA = Make2ThetaAzimuthMap(data,imageN)           #2-theta & azimuth arrays
+        TA,tam = Make2ThetaAzimuthMap(data,masks,imageN)           #2-theta & azimuth arrays & create position mask
         dlg.Update(1)
         print 'Fill map with 2-theta/azimuth values'
-        tax,tay,taz = Fill2ThetaAzimuthMap(masks,TA,self.ImageZ)
+        tax,tay,taz = Fill2ThetaAzimuthMap(masks,TA,tam,self.ImageZ)    #and apply masks
         del TA
         dlg.Update(2)
@@ -496 +498 @@
         dlg.Update(4)
         t1 = time.time()
+        print "Elapsed time:","%8.3f"%(t1-t0), "s"
         print 'Integration complete'
-        print "Elapsed time:","%8.3f"%(t1-t0), "s"
     finally:
         dlg.Destroy()

trunk/GSASIIplot.py ¶

@@ -11 +11 @@
 import GSASIIIO as G2IO
 import GSASIIpwdGUI as G2pdG
+import GSASIIimgGUI as G2imG
 from matplotlib.backends.backend_wxagg import FigureCanvasWxAgg as Canvas
 from matplotlib.backends.backend_wxagg import NavigationToolbar2Wx as Toolbar
@@ -49 +50 @@
         self.status = parent.CreateStatusBar()
         self.status.SetFieldsCount(2)
-        self.status.SetStatusWidths([-1,120])
+        self.status.SetStatusWidths([125,-1])
         self.Bind(wx.aui.EVT_AUINOTEBOOK_PAGE_CHANGED, self.OnPageChanged)
         
@@ -99 +100 @@
         print i
         HKLtxt = '(%3d,%3d,%3d %10.2f %6.3f %10.2f)'%(h,k,l,Fosq,sig,Fcsq)
-        self.G2plotNB.status.SetFields(['HKL, Fosq, sig, Fcsq = '+HKLtxt,''])
+        self.G2plotNB.status.SetFields(['','HKL, Fosq, sig, Fcsq = '+HKLtxt])
                          
         
@@ -272 +273 @@
                 if abs(xpos) > 0.:                  #avoid possible singularity at beam center
                     dsp = wave/(2.*sind(abs(xpos)/2.0))
-                self.G2plotNB.status.SetStatusText('2-theta =%9.3f d =%9.5f Intensity =%9.1f'%(xpos,dsp,ypos),0)
+                self.G2plotNB.status.SetStatusText('2-theta =%9.3f d =%9.5f Intensity =%9.1f'%(xpos,dsp,ypos),1)
                 if self.itemPicked:
                     Page.canvas.SetToolTipString('%9.3f'%(xpos))
             except TypeError:
-                self.G2plotNB.status.SetStatusText('Select PWDR powder pattern first',0)
+                self.G2plotNB.status.SetStatusText('Select PWDR powder pattern first',1)
                                    
     def OnRelease(event):
@@ -325 +326 @@
         choices=(' key press','d: offset down','u: offset up','c: toggle contour','s: toggle single plot'))
     cb.Bind(wx.EVT_COMBOBOX, OnKeyBox)
-    rect = self.G2plotNB.status.GetFieldRect(1)
-    cb.SetPosition((rect.x,rect.y))
     cb.SetValue(' key press')
     
@@ -433 +432 @@
         if xpos:                                        #avoid out of frame mouse position
             Page.canvas.SetCursor(wx.CROSS_CURSOR)
-            self.G2plotNB.status.SetFields(['2-theta =%9.3f '%(xpos,),''])
+            self.G2plotNB.status.SetFields(['','2-theta =%9.3f '%(xpos,)])
 
     try:
@@ -562 +561 @@
 
 def PlotImage(self,newPlot=False):
-    from matplotlib.patches import Ellipse,Arc
+    from matplotlib.patches import Ellipse,Arc,Circle
     import numpy.ma as ma
 
@@ -569 +568 @@
         size = len(self.ImageZ)
         if event.xdata and event.ydata:                 #avoid out of frame errors
-            Data = self.PatternTree.GetItemPyData( \
-                G2gd.GetPatternTreeItemId(self,self.Image, 'Image Controls'))
             Page.canvas.SetCursor(wx.CROSS_CURSOR)
             item = self.itemPicked
@@ -597 +594 @@
                 if (0 <= xpix <= size) and (0 <= ypix <= size):
                     Int = self.ImageZ[ypix][xpix]
-#                    Page.canvas.SetToolTipString('%4x'%((ypix*2048+xpix)*2+4096))
                 tth,azm,dsp = G2img.GetTthAzmDsp(xpos,ypos,Data)
                 Q = 2.*math.pi/dsp
                 self.G2plotNB.status.SetFields(\
-                    ['Detector 2-th =%9.2fdeg, dsp =%9.3fA, Q = %6.3fA-1, azm = %7.2fdeg, I = %6d'%(tth,dsp,Q,azm,Int),''])
+                    ['','Detector 2-th =%9.2fdeg, dsp =%9.3fA, Q = %6.3fA-1, azm = %7.2fdeg, I = %6d'%(tth,dsp,Q,azm,Int)])
 
     def OnImPlotKeyPress(event):
-        if self.PatternTree.GetItemText(self.PickId) == 'Image Controls':
-            Data = self.PatternTree.GetItemPyData(self.PickId)
-            pixelSize = Data['pixelSize']
-            size = len(self.ImageZ)
+        if self.PatternTree.GetItemText(self.PickId) == 'Masks':
+            Mask = self.PatternTree.GetItemPyData(self.PickId)
             Xpos = event.xdata
             if not Xpos:            #got point out of frame
                 return
             Ypos = event.ydata
-            if event.key == 'm':
-                print 'mask = ',Xpos,Ypos
+            if event.key == 's':
+                print 'spot mask @ ',Xpos,Ypos
+                Mask['Points'].append([Xpos,Ypos,1])
+            elif event.key == 'r':
+                print 'ring mask @ ',Xpos,Ypos
+            elif event.key == 'a':
+                print 'arc mask @ ', Xpos,Ypos
+            G2imG.UpdateMasks(self,Mask)
+        PlotImage(self)
             
     def OnImPick(event):
-        if self.PatternTree.GetItemText(self.PickId) != 'Image Controls':
+        if self.PatternTree.GetItemText(self.PickId) not in ['Image Controls','Masks']:
             return
         if self.itemPicked is not None: return
@@ -623 +624 @@
         
     def OnImRelease(event):
-        if self.PatternTree.GetItemText(self.PickId) != 'Image Controls':
+        PickName = self.PatternTree.GetItemText(self.PickId)
+        if PickName not in ['Image Controls','Masks']:
             return
-        Data = self.PatternTree.GetItemPyData(self.PickId)
         pixelSize = Data['pixelSize']
         scalex = 1000./pixelSize[0]
         scaley = 1000./pixelSize[1]
-        if self.itemPicked is None:
+        if self.itemPicked is None and PickName == 'Image Controls':
             size = len(self.ImageZ)
             Xpos = event.xdata
@@ -660 +661 @@
                 else:
                     tth,azm,dsp = G2img.GetTthAzmDsp(xpos,ypos,Data)
-                    if 'Line2D' in str(self.itemPicked):
+                    itemPicked = str(self.itemPicked)
+                    if 'Line2D' in itemPicked and PickName == 'Image Controls':
                         if 'line1' in str(self.itemPicked):
                             Data['IOtth'][0] = tth
@@ -679 +681 @@
                         self.Lazim.SetValue("%6d" % (Data['LRazimuth'][0]))
                         self.Razim.SetValue("%6d" % (Data['LRazimuth'][1]))
+                    elif 'Circle' in itemPicked and PickName == 'Masks':
+                        spots = Masks['Points']
+                        newPos = itemPicked.split(')')[0].split('(')[2].split(',')
+                        newPos = np.array([float(newPos[0]),float(newPos[1])])
+                        for spot in spots:
+                            if np.allclose(np.array([spot[:2]]),newPos):
+                                spot[:2] = xpos,ypos
+                        G2imG.UpdateMasks(self,Masks)
                     else:
-                        print event.xdata,event.ydata,event.button
+                        print str(self.itemPicked),event.xdata,event.ydata,event.button
                 PlotImage(self)
             self.itemPicked = None
@@ -711 +721 @@
     Masks = self.PatternTree.GetItemPyData(
         G2gd.GetPatternTreeItemId(self,self.Image, 'Masks'))
+
     imScale = 1
     if len(self.ImageZ) > 1024:
@@ -728 +739 @@
     #need "applyMask" routine here
     Zlim = Masks['Thresholds'][1]
+    spots = Masks['Points']
     MA = ma.masked_greater(ma.masked_less(self.ImageZ,Zlim[0]),Zlim[1])
     MaskA = ma.getmaskarray(MA)
@@ -737 +749 @@
     Img = Plot.imshow(A,aspect='equal',cmap=acolor,
         interpolation='nearest',vmin=Imin,vmax=Imax,extent=[0,Xmax,Xmax,0])
+    for x,y,d in spots:
+        Plot.add_artist(Circle((x,y),radius=d/2,fc='r',ec='r',picker=3))
 
     Plot.plot(xcent,ycent,'x')
@@ -800 +814 @@
         if azm and tth:
             self.G2plotNB.status.SetFields(\
-                ['Detector 2-th =%9.3fdeg, azm = %7.2fdeg'%(tth,azm),''])
+                ['','Detector 2-th =%9.3fdeg, azm = %7.2fdeg'%(tth,azm)])
                                 
     try:
@@ -865 +879 @@
         if azm and tth:
             self.G2plotNB.status.SetFields(\
-                ['Detector 2-th =%9.3fdeg, azm = %7.2fdeg'%(tth,azm),''])
+                ['','Detector 2-th =%9.3fdeg, azm = %7.2fdeg'%(tth,azm)])
                                 
     try: