Changeset 94 for trunk/GSASIIimage.py

Timestamp:

Jul 1, 2010 9:25:08 AM (12 years ago)

Author:

vondreel

Message:

move all fortran to fsource
add gray for readonly textctrl
do polygon insert, show in imageGUI and make mask
fix to ReadPDBphase to use correct crystal to cartesian transformation matrix

File:

• trunk/GSASIIimage.py (modified) (2 diffs)

trunk/GSASIIimage.py

@@ -24 +24 @@
 npatand = lambda x: 180.*np.arctan(x)/np.pi
 npatan2d = lambda y,x: 180.*np.arctan2(y,x)/np.pi
+    
+def pointInPolygon(pXY,xy):
+    #pXY - assumed closed 1st & last points are duplicates
+    Inside = False
+    N = len(pXY)
+    p1x,p1y = pXY[0]
+    for i in range(N+1):
+        p2x,p2y = pXY[i%N]
+        if (max(p1y,p2y) >= xy[1] > min(p1y,p2y)) and (xy[0] <= max(p1x,p2x)):
+            if p1y != p2y:
+                xinters = (xy[1]-p1y)*(p2x-p1x)/(p2y-p1y)+p1x
+            if p1x == p2x or xy[0] <= xinters:
+                Inside = not Inside
+        p1x,p1y = p2x,p2y
+    return Inside
         
 def makeMat(Angle,Axis):
@@ -454 +469 @@
     #make position masks here
     spots = masks['Points']
+    polygons = masks['Polygons']
     tam = ma.make_mask_none((imageN,imageN))
     for X,Y,diam in spots:
         tam = ma.mask_or(tam,ma.getmask(ma.masked_less((tax-X)**2+(tay-Y)**2,(diam/2.)**2)))
+    for polygon in polygons:
+        tam = ma.mask_or(tam.flatten(),ma.make_mask([pointInPolygon(polygon,xy) for xy in zip(tax.flatten(),tay.flatten())]))
     return GetTthAzm(tax,tay,data),tam           #2-theta & azimuth arrays & position mask