Changeset 766

Timestamp:

Oct 1, 2012 10:24:14 AM (11 years ago)

Author:

vondreele

Message:

map peaks now show with gray scale proportional to density

File:

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

trunk/GSASIIplot.py

@@ -2323 +2323 @@
     mapPeaks = []
     if 'Map Peaks' in data:
-        mapPeaks = data['Map Peaks']
+        mapPeaks = np.array(data['Map Peaks'])
+        peakMax = np.max(mapPeaks.T[0])
     drawingData = data['Drawing']
     try:
@@ -2829 +2830 @@
         glPopMatrix()
 
-    def RenderMapPeak(x,y,z,color):
+    def RenderMapPeak(x,y,z,color,den):
         xyz = np.array([x,y,z])
         glEnable(GL_COLOR_MATERIAL)
         glLineWidth(3)
-        glColor3fv(color)
+        glColor3fv(color*den/255)
         glPushMatrix()
         glBegin(GL_LINES)
@@ -3052 +3053 @@
             for ind,[mag,x,y,z,d] in enumerate(mapPeaks):
                 if ind in Ind and pageName == 'Map peaks':
-                    RenderMapPeak(x,y,z,Gr)
+                    RenderMapPeak(x,y,z,Gr,1.0)
                 else:
-                    RenderMapPeak(x,y,z,Wt)
+                    RenderMapPeak(x,y,z,Wt,mag/peakMax)
         if Backbones:
             for chain in Backbones: