Changeset 4641 for trunk/GSASIIplot.py

Timestamp:

Nov 3, 2020 8:30:31 AM (2 years ago)

Author:

vondreele

Message:

add color contouring to map slice display. Will plot lines, colors or lines+colors. Allows color scheme selection

File:

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

trunk/GSASIIplot.py

@@ -8148 +8148 @@
             
         elif key in ['K'] and generalData['Map']['MapType']:
-            drawingData['showSlice'] = not drawingData.get('showSlice',False)
+            drawingData['showSlice'] = (drawingData['showSlice']+1)%4
             SetShowCS(drawingData['showSlice'])
+            
+        elif key in ['S']:
+            choice = [m for m in mpl.cm.datad.keys()]   # if not m.endswith("_r")
+            choice.sort()
+            dlg = wx.SingleChoiceDialog(G2frame,'Select','Color scheme',choice)
+            if dlg.ShowModal() == wx.ID_OK:
+                sel = dlg.GetSelection()
+                drawingData['contourColor'] = choice[sel]
+            dlg.Destroy()
                 
         elif key in ['P']:
@@ -8388 +8397 @@
                     G2frame.G2plotNB.status.SetStatusText('New quaternion: %.2f+, %.2fi+ ,%.2fj+, %.2fk'%(Q[0],Q[1],Q[2],Q[3]),1)
                 Draw('move')
-        elif drawingData.get('showSlice'):
+        elif drawingData['showSlice']:
             View = GL.glGetIntegerv(GL.GL_VIEWPORT)
             Tx,Ty,Tz = drawingData['viewPoint'][0]
@@ -8394 +8403 @@
             Cx,Cy,Cz = GLU.gluUnProject(newxy[0],View[3]-newxy[1],tz)
             rho = G2mth.getRho([Cx,Cy,Cz],mapData)
-            contlevels = contourSet.get_array()
-            contstr = str(contlevels).strip('[]')
-            G2frame.G2plotNB.status.SetStatusText('Cursor position: %.4f, %.4f, %.4f; density: %.4f, contours at: %s'%(Cx,Cy,Cz,rho,contstr),1)
+            if drawingData['showSlice'] in [1,3]:
+                contlevels = contourSet.get_array()
+                contstr = str(contlevels).strip('[]')
+                G2frame.G2plotNB.status.SetStatusText('Cursor position: %.4f, %.4f, %.4f; density: %.4f, contours at: %s'%(Cx,Cy,Cz,rho,contstr),1)
+            else:
+                G2frame.G2plotNB.status.SetStatusText('Cursor position: %.4f, %.4f, %.4f; density: %.4f'%(Cx,Cy,Cz,rho),1)
         
     def OnMouseWheel(event):
@@ -9415 +9427 @@
                 for plane in Planes:
                     RenderPlane(plane,color)
-        if drawingData.get('showSlice',False):      #must be done last to properly show things behind as faded
+        if drawingData.get('showSlice',0):      #must be done last to properly show things behind as faded
             global contourSet,Zslice
             if len(D4mapData.get('rho',[])):        #preferentially select 4D map if there
@@ -9441 +9453 @@
                 Zslice = np.reshape(map_coordinates(rho,(SXYZ%1.*rho.shape).T,order=1,mode='wrap'),(npts,npts))
             Z = np.where(Zslice<=Rmax,Zslice,Rmax)
+            ZU = np.flipud(Z)
             plt.rcParams['figure.facecolor'] = (1.,1.,1.,.5)
             oldSize = plt.rcParams['figure.figsize']
             plt.rcParams['figure.figsize'] = [6.0,6.0]
             plt.cla()
-            contourSet = plt.contour(Z,colors='k',linewidths=1)
+            if drawingData['showSlice'] in [1,]:
+                contourSet = plt.contour(Z,colors='k',linewidths=1)
+            if drawingData['showSlice'] in [2,3]:
+                acolor = mpl.cm.get_cmap(drawingData.get('contourColor','Paired'))                    
+                plt.imshow(ZU,aspect='equal',cmap=acolor,alpha=0.75,interpolation='bilinear')
+                if drawingData['showSlice'] in [3,]:
+                    contourSet = plt.contour(ZU,colors='k',linewidths=1)
             plt.axis("off")
             plt.subplots_adjust(bottom=0.,top=1.,left=0.,right=1.,wspace=0.,hspace=0.)
@@ -9575 +9594 @@
     choice = [' save as/key:','jpeg','tiff','bmp','c: center on 1/2,1/2,1/2']
     if mapData['MapType']:
-        choice += ['k: toggle contour plot',]
+        choice += ['k: none, lines, color, color+lines contour plot switch',]
+        choice += ['s: select map slice color scheme',]
     if mapData.get('Flip',False):
         choice += ['u: roll up','d: roll down','l: roll left','r: roll right']