Changeset 2187 for trunk/GSASIIplot.py

Timestamp:

Mar 31, 2016 3:17:43 PM (7 years ago)

Author:

vondreele

Message:

Modify the Cite please banners to add small angle & DIFFaX references
remov
e 'axial' from DIFFaX choices (for now) as it leads to a streak calculation not supported in GSAS-II
replace pylab stuff with use of PlotXYZ which has been improved
fix character Greek 'mu' in Layers GUI
new GSAS-II function for calculating selected area diffraction (still testing)

File:

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

trunk/GSASIIplot.py

@@ -2397 +2397 @@
     '''simple contour plot of xyz data, used for diagnostic purposes
     '''
+    def OnKeyPress(event):
+        if event.key == 'u':
+            G2frame.Cmax = min(1.0,G2frame.Cmax*1.2) 
+        elif event.key == 'd':
+            G2frame.Cmax = max(0.0,G2frame.Cmax*0.8)
+        elif event.key == 'o':
+            G2frame.Cmax = 1.0
+            
+        elif event.key == 'i':
+            choice = ['nearest','bilinear','bicubic','spline16','spline36','hanning',
+               'hamming','hermite','kaiser','quadric','catrom','gaussian','bessel',
+               'mitchell','sinc','lanczos']
+            dlg = wx.SingleChoiceDialog(G2frame,'Select','Interpolation',choice)
+            if dlg.ShowModal() == wx.ID_OK:
+                sel = dlg.GetSelection()
+                G2frame.Interpolate = choice[sel]
+            else:
+                G2frame.Interpolate = 'nearest'
+            dlg.Destroy()
+            
+        elif event.key == '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()
+                G2frame.ContourColor = choice[sel]
+            else:
+                G2frame.ContourColor = 'Paired'
+            dlg.Destroy()
+        wx.CallAfter(PlotXYZ,G2frame,XY,Z,labelX,labelY,False,Title)
+    
     def OnMotion(event):
         xpos = event.xdata
-        if xpos:                                        #avoid out of frame mouse position
+        if Xmin<xpos<Xmax:                                        #avoid out of frame mouse position
             ypos = event.ydata
-            Page.canvas.SetCursor(wx.CROSS_CURSOR)
-            ix = int(Nxy[0]*(xpos-Xmin)+0.5)
-            iy = int(Nxy[1]*(ypos-Ymin)+0.5)
-            try:
-                G2frame.G2plotNB.status.SetStatusText('%s =%9.3f %s =%9.3f val =%9.3f'% \
-                    (labelX,xpos,labelY,ypos,Z[ix,iy]),1)                   
-            except TypeError:
-                G2frame.G2plotNB.status.SetStatusText('Select '+Title+' pattern first',1)
-
+            if Ymin<ypos<Ymax:
+                Xwd = Xmax-Xmin
+                Ywd = Ymax-Ymin
+                Page.canvas.SetCursor(wx.CROSS_CURSOR)
+                ix = int(Nxy[0]*(xpos-Xmin)/Xwd)
+                iy = int(Nxy[1]*(ypos-Ymin)/Ywd)
+                try:
+                    G2frame.G2plotNB.status.SetStatusText('%s =%9.3f %s =%9.3f val =%9.3f'% \
+                        (labelX,xpos,labelY,ypos,Z[ix,iy]),1)                   
+                except TypeError:
+                    G2frame.G2plotNB.status.SetStatusText('Select '+Title+' pattern first',1)
+                    
     try:
         plotNum = G2frame.G2plotNB.plotList.index(Title)
@@ -2424 +2459 @@
         Page = G2frame.G2plotNB.nb.GetPage(plotNum)
         Page.canvas.mpl_connect('motion_notify_event', OnMotion)
+        Page.canvas.mpl_connect('key_press_event', OnKeyPress)
     
-    Page.Choice = None
+    Page.Choice = (' key press','d: lower contour max','u: raise contour max','o: reset contour max',
+        'i: interpolation method','s: color scheme')
     Page.SetFocus()
     G2frame.G2plotNB.status.DestroyChildren()
     Nxy = Z.shape
+    Zmax = np.max(Z)
     Xmin = np.min(XY[0])
     Xmax = np.max(XY[0])
@@ -2442 +2480 @@
     else:
         Plot.set_ylabel(r'Y',fontsize=14)
-    Img = Plot.imshow(Z.T,cmap='Paired',interpolation='nearest',origin='lower', \
-        aspect='auto',extent=[Xmin,Xmax,Ymin,Ymax])
+    acolor = mpl.cm.get_cmap(G2frame.ContourColor)
+    Img = Plot.imshow(Z.T,cmap=acolor,interpolation=G2frame.Interpolate,origin='lower', \
+        aspect='auto',extent=[Xmin,Xmax,Ymin,Ymax],vmin=0,vmax=Zmax*G2frame.Cmax)
     Page.figure.colorbar(Img)
     if not newPlot: