Changeset 2945 for branch/2frame/GSASIIplot.py

Timestamp:

Jul 27, 2017 3:03:15 PM (6 years ago)

Author:

vondreele

Message:

 

File:

• branch/2frame/GSASIIplot.py (modified) (5 diffs)

branch/2frame/GSASIIplot.py

@@ -2973 +2973 @@
 ################################################################################
             
-def PlotXYZ(G2frame,XY,Z,labelX='X',labelY='Y',newPlot=False,Title=''):
+def PlotXYZ(G2frame,XY,Z,labelX='X',labelY='Y',newPlot=False,Title='',zrange=None,color=None):
     '''simple contour plot of xyz data
     
@@ -2983 +2983 @@
     :param bool newPlot: =True if new plot is to be made
     :param str Title: title for plot
+    :param list zrange: [zmin,zmax]; default=None to use limits in Z
+    :param str color: one of mpl.cm.dated.keys(); default=None to use G2frame.ContourColor
     :returns: nothing
     
@@ -3014 +3016 @@
                 G2frame.ContourColor = choice[sel]
             else:
-                G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','Paired')
+                G2frame.ContourColor = GSASIIpath.GetConfigValue('Contour_color','RdYlGn')
             dlg.Destroy()
         wx.CallAfter(PlotXYZ,G2frame,XY,Z,labelX,labelY,False,Title)
@@ -3054 +3056 @@
     Ymin = np.min(XY.T[0])
     Ymax = np.max(XY.T[0])
-    Dx = 0.5*(Xmax-Xmin)/Nxy[0]
-    Dy = 0.5*(Ymax-Ymin)/Nxy[1]
+#    Dx = 0.5*(Xmax-Xmin)/Nxy[0]
+#    Dy = 0.5*(Ymax-Ymin)/Nxy[1]
     Plot.set_title(Title)
     if labelX:
@@ -3065 +3067 @@
     else:
         Plot.set_ylabel(r'Y',fontsize=14)
-    acolor = mpl.cm.get_cmap(G2frame.ContourColor)
+    if color is None:
+        acolor = mpl.cm.get_cmap(G2frame.ContourColor)
+    else:
+        acolor = mpl.cm.get_cmap(color)
+    if zrange is None:
+        zrange=[0,Zmax*G2frame.Cmax]
     Img = Plot.imshow(Z.T,cmap=acolor,interpolation=G2frame.Interpolate,origin='lower', \
-        aspect='equal',extent=[Xmin,Xmax,Ymin,Ymax],vmin=0,vmax=Zmax*G2frame.Cmax)
-#        aspect='equal',extent=[Xmin-Dx,Xmax-Dx,Ymin+Dy,Ymax+Dy],vmin=0,vmax=Zmax*G2frame.Cmax)
+        aspect='equal',extent=[Xmin,Xmax,Ymin,Ymax],vmin=zrange[0],vmax=zrange[1])
     Page.figure.colorbar(Img)
     if not newPlot: