prevent rescaling of plots when not needed; fix bug in unequally stepped contour plots; minor contour plot formatting

Author: briantoby

GSASII/GSASIIdataGUI.py

@@ -8512,11 +8512,20 @@ def OnEditMag(**args):
     G2frame.GPXtree.SetItemPyData(item,data)
     G2frame.PatternId = item
     if kind in ['PWDR','SASD','REFD',]:
-        NewPlot = True
-        if 'Contour' in dir(G2frame) and G2frame.Contour:
-            pass
-        elif 'xylim' in dir(G2frame):
+        # When I added code to allow for contour plots from unequally spaced data
+        # I forced all contour plots to replot with newPlot=True. I'm not sure if
+        # this is actually needed and for autointegration we really don't want 
+        # plots to rescale.
+        # NewPlot = True
+        # if getattr(G2frame,'Contour',False):
+        #     pass
+        # if hasattr(G2frame,'xylim'):
+        #    NewPlot = False
+        # now only rescale when needed
+        if hasattr(G2frame,'xylim'):
             NewPlot = False
+        else:
+            NewPlot = True
         # if GSASIIpath.GetConfigValue('debug'):
         #     from importlib import reload
         #     reload(G2pwpl)
@@ -8964,16 +8973,21 @@ def OnShowShift(event):
         G2pdG.UpdatePeakGrid(G2frame,data)
         for i in G2frame.ExportPeakList: i.Enable(True)
         newPlot = False
-        if hasattr(G2frame,'Contour'):
-            if G2frame.Contour:
-                G2frame.Contour = False
-                newPlot = True
+        if getattr(G2frame,'Contour','False'):
+            G2frame.Contour = False
+            newPlot = True
         G2pwpl.PlotPatterns(G2frame,newPlot,fromTree=True)
     elif G2frame.GPXtree.GetItemText(item) == 'Background':
+        NewPlot = False  # plot using previous limits
+        if getattr(G2frame,'Contour',False):  # except if contour plot
+            G2frame.Contour = False
+            NewPlot = True
+        elif not hasattr(G2frame,'xylim'):   # or no limits present
+            NewPlot = True
         G2frame.PatternId = G2frame.GPXtree.GetItemParent(item)
         data = G2frame.GPXtree.GetItemPyData(item)
         G2pdG.UpdateBackground(G2frame,data)
-        G2pwpl.PlotPatterns(G2frame,True,fromTree=True)
+        G2pwpl.PlotPatterns(G2frame,newPlot=NewPlot,fromTree=True)
     elif G2frame.GPXtree.GetItemText(item) == 'Limits':
         G2frame.PatternId = G2frame.GPXtree.GetItemParent(item)
         datatype = G2frame.GPXtree.GetItemText(G2frame.PatternId)[:4]
@@ -9035,10 +9049,9 @@ def OnShowShift(event):
             G2plt.PlotPowderLines(G2frame)
         else:
             newPlot = False
-            if hasattr(G2frame,'Contour'):
-                if G2frame.Contour:
-                    G2frame.Contour = False
-                    newPlot = True
+            if getattr(G2frame,'Contour','False'):
+                G2frame.Contour = False
+                newPlot = True
             G2pwpl.PlotPatterns(G2frame,newPlot,fromTree=True)
     elif G2frame.GPXtree.GetItemText(item) == 'Unit Cells List':
         G2frame.PatternId = G2frame.GPXtree.GetItemParent(item)
@@ -9066,10 +9079,9 @@ def OnShowShift(event):
         G2pdG.UpdateReflectionGrid(G2frame,data)
         G2frame.dataWindow.HideShow.Enable(False)
         newPlot = False
-        if hasattr(G2frame,'Contour'):
-            if G2frame.Contour:
-                G2frame.Contour = False
-                newPlot = True
+        if getattr(G2frame,'Contour','False'):
+            G2frame.Contour = False
+            newPlot = True
         G2pwpl.PlotPatterns(G2frame,newPlot,fromTree=True)
     elif G2frame.GPXtree.GetItemText(item) == 'Reflection List':    #HKLF reflections
         G2frame.PatternId = G2frame.GPXtree.GetItemParent(item)

GSASII/GSASIIpwdplot.py

@@ -2137,11 +2137,16 @@ def onPartialConfig(event):
 
         # convert all X values and then reapply mask if xye0 is a masked array
         mask = None
-        if hasattr(xye0,'mask'): mask = xye0.mask
+        if hasattr(xye0,'mask'): 
+            mask = xye0.mask
+            X = xye0.data
+        else:
+            mask = None
+            X = xye0
         if Page.plotStyle['qPlot'] and 'PWDR' in plottype and not ifLimits:
-            X = ma.array(2.*np.pi/G2lat.Pos2dsp(Parms,xye0.data),mask=mask)
+            X = ma.array(2.*np.pi/G2lat.Pos2dsp(Parms,X),mask=mask)
         elif Page.plotStyle['dPlot'] and 'PWDR' in plottype and not ifLimits:
-            X = ma.array(G2lat.Pos2dsp(Parms,xye0.data),mask=mask)
+            X = ma.array(G2lat.Pos2dsp(Parms,X),mask=mask)
         else:
             X = copy.deepcopy(xye0)
         if ifpicked and not G2frame.Contour:
@@ -2482,7 +2487,10 @@ def onPartialConfig(event):
 
                         G2plt.Write2csv(fp,['masked X','X','obs','calc','bkg','diff'],header=True)
                         for i in range(len(X)):
-                            G2plt.Write2csv(fp,[X[i],X.data[i],Y[i],Z[i],W[i],D[i]],header=False)
+                            if hasattr(X,'mask'): 
+                                G2plt.Write2csv(fp,[X[i],X.data[i],Y[i],Z[i],W[i],D[i]],header=False)
+                            else:
+                                G2plt.Write2csv(fp,[X[i],X[i],Y[i],Z[i],W[i],D[i]],header=False)
                         fp.close()
                         print('file',plotOpt['CSVfile'],'written')
 
@@ -2726,7 +2734,7 @@ def onPartialConfig(event):
                     siz = 6
                 elif len(legends) > 15:
                     siz = 8
-                lngd = Plot.legend(handles,legends,title=msg,loc='best',
+                Plot.legend(handles,legends,title=msg,loc='best',
                                        fontsize=siz)
     if G2frame.Contour:
         time0 = time.time()
@@ -2850,7 +2858,7 @@ def onPartialConfig(event):
         # Page.toolbar.set_history_buttons() # this may be needed to update the zoom buttons (needs test)
         # Page.canvas.draw_idle() # schedule an MPL update (needs test)
         if G2frame.Contour: # for contour plots expand y-axis to include all histograms
-            G2frame.xylim = (G2frame.xylim[0], (0.,len(PlotList)))
+            G2frame.xylim = (G2frame.xylim[0], (-0.5,len(PlotList)-0.5))
         if 'PWDR' in plottype:
             Plot.set_xlim(G2frame.xylim[0])
             Plot.set_ylim(G2frame.xylim[1])
@@ -2861,6 +2869,24 @@ def onPartialConfig(event):
     else:
         G2frame.xylim = Plot.get_xlim(),Plot.get_ylim()
         Page.canvas.draw()
+    if G2frame.Contour: # for contour plots remove non-integer yaxis labels as they are a distraction
+        labels = []
+        vals = []
+        for item in Plot.get_yticklabels():
+            lbl = item.get_text()
+            try:
+                val = float(lbl.replace('\u2212', '-'))
+                if int(val) != val: 
+                    continue
+                elif val < 0 or val > G2frame.xylim[1][1]: # out of range labels not needed
+                    continue
+                else:
+                    vals.append(val)
+                    labels.append(str(int(val)))
+            except:
+                pass
+        Plot.yaxis.set_ticks(vals,labels)
+        Page.canvas.draw()
     olderr = np.seterr(invalid='ignore') #ugh - this removes a matplotlib error for mouse clicks in log plots
     # and sqrt(-ve) in np.where usage               
     if 'PWDR' in G2frame.GPXtree.GetItemText(G2frame.PickId):