more work on preventing limit resets; this should replace everything in PR #285

Author: briantoby

GSASII/GSASIIplot.py

@@ -474,31 +474,31 @@ def FindPlotTab(self,label,Type,newImage=True,saveLimits=False):
         Page.toolbar.enableArrows() # Disable Arrow keys if present
         return new,plotNum,Page,Plot,limits
 
-    def savePlotLims(self,Page):
+    def savePlotLims(self,Page,debug=False):
         '''Make a copy of all the current axes in the notebook object
         '''
         self.savedPlotLims = [
             [i.get_xlim() for i in Page.figure.get_axes()],
             [i.get_ylim() for i in Page.figure.get_axes()]]
-        #print(f'saved {len(self.savedPlotLims[1])} axes limits')
-
+        if debug:
+            print(f'saved {len(self.savedPlotLims[1])} axes limits')
+            #print( self.savedPlotLims)
     def restoreSavedPlotLims(self,Page):
         '''Restore the plot limits, when previously saved, and when 
         ``G2frame.restorePlotLimits`` is set to True, which 
         is done when ``GSASIIpwdplot.refPlotUpdate`` is called with
-        ``restore=True``, which indicates that "live plotting" is done.
+        ``restore=True``, which indicates that "live plotting" is 
+        finished. This is also set for certain plot key-press
+        combinations.
         The restore operation can only be done once, as the limits
         are deleted after use in this method.
         '''
         if self.savedPlotLims is None:
             #print('---- nothing to restore')
             return
-        if not hasattr(self.G2frame,'restorePlotLimits'):
+        if not getattr(self.G2frame,'restorePlotLimits',False):
             #print('---- restorePlotLimits not set')
             return
-        if not self.G2frame.restorePlotLimits:
-            #print('---- restorePlotLimits: not yet')
-            return
         savedPlotLims = self.savedPlotLims
         axesList = Page.figure.get_axes()
         if len(axesList) != len(savedPlotLims[0]):

GSASII/GSASIIpwdplot.py

@@ -188,15 +188,17 @@ def OnPlotKeyPress(event):
         except TypeError:
             G2frame.G2plotNB.status.SetStatusText(f'Select {plottype} pattern first',1)
             return
+        if 'GROUP' in plottype: # save plot limits in case we want to restore them 
+            G2frame.G2plotNB.savePlotLims(Page)
         newPlot = False
-        if event.key == 'w':
+        if event.key == 'w' and not 'GROUP' in plottype:
             G2frame.Weight = not G2frame.Weight
             if not G2frame.Weight and not G2frame.Contour and 'PWDR' in plottype:
                 G2frame.SinglePlot = True
             elif 'PWDR' in plottype: # Turning on Weight plot clears previous limits
                 G2frame.FixedLimits['dylims'] = ['','']                
             #newPlot = True # this resets the x & y limits, not wanted!
-        elif event.key in ['shift+1','!']: # save current plot settings as defaults
+        elif event.key in ['shift+1','!'] and not 'GROUP' in plottype: # save current plot settings as defaults
             # shift+1 assumes US keyboard
             print('saving plotting defaults for',G2frame.GPXtree.GetItemText(G2frame.PatternId))
             data = G2frame.GPXtree.GetItemPyData(G2frame.PatternId)
@@ -213,6 +215,7 @@ def OnPlotKeyPress(event):
         elif event.key == 'f' and ('PWDR' in plottype or 'GROUP'  in plottype): # short,full length or no tick-marks
             if G2frame.Contour: return
             Page.plotStyle['flTicks'] = (Page.plotStyle.get('flTicks',0)+1)%3
+            if 'GROUP' in plottype: G2frame.restorePlotLimits = True
         elif event.key == 'x' and groupName is not None: # share X axis scale for Pattern Groups
             plotOpt['sharedX'] = not plotOpt['sharedX']
             # Clear saved x-limits when toggling sharedX mode (MG/Cl Sonnet)
@@ -304,6 +307,7 @@ def OnPlotKeyPress(event):
             elif Page.plotStyle['Offset'][0] > -100.:
                 Page.plotStyle['Offset'][0] -= 10.
         elif event.key == 'g':
+            if 'GROUP' in plottype: G2frame.restorePlotLimits = True
             mpl.rcParams['axes.grid'] = not mpl.rcParams['axes.grid']
         elif event.key == 'l' and not G2frame.SinglePlot:
             Page.plotStyle['Offset'][1] -= 1.
@@ -2257,7 +2261,7 @@ def onGroupXlimChanged(ax):
         Page.Choice = [' key press',
                 'f: toggle full-length ticks',
                 'g: toggle grid',
-                's: toggle sqrt plot',
+                #'s: toggle sqrt plot',  # TODO: implement this
                 'q: toggle Q plot',
                 't: toggle d-spacing plot',
                 'x: share x-axes (Q/d only)']
@@ -2326,7 +2330,7 @@ def onGroupXlimChanged(ax):
             totalrange += gXmax[i]-gXmin[i]
         if plotOpt['sharedX'] and (
                 Page.plotStyle['qPlot'] or Page.plotStyle['dPlot']):
-            Page.figure.text(0.001,0.94,'X shared',fontsize=11,
+            Page.figure.text(0.94,0.03,'X shared',fontsize=10,
                                  color='g')
             GS_kw = {'height_ratios':[4, 1]}
             #Plots = Page.figure.subplots(2,Page.groupN,sharey='row',sharex=True,
@@ -2484,8 +2488,8 @@ def onGroupXlimChanged(ax):
                         (Page.plotStyle['qPlot'] or Page.plotStyle['dPlot'])):
             up,down = adjustDim(0,Page.groupN)
             G2frame.groupXlim = Plots[up].get_xlim()
+        wx.CallAfter(G2frame.G2plotNB.restoreSavedPlotLims,Page)  # restore limits to previous, if saved & requested
         Page.canvas.draw()
-        wx.CallLater(100,G2frame.G2plotNB.restoreSavedPlotLims,Page)  # restore limits to previous, if saved
         return # end of group plot
     elif G2frame.Weight and not G2frame.Contour:
         Plot.set_visible(False)         #hide old plot frame, will get replaced below