Register figureoptions edits in views history.

anntzer · anntzer · commit 70dcaa613665 · 2016-06-17T22:05:01.000-07:00
Changing axes limits in views history is now taken into account by the
views history navigation.  The home position is now defined the first
time the figure canvas is drawn (rather than the first time an edit
button is selected), via a one-shot callback.
diff --git a/lib/matplotlib/backend_bases.py b/lib/matplotlib/backend_bases.py
@@ -39,6 +39,7 @@
 from six.moves import xrange
 
 from contextlib import contextmanager
+from functools import partial
 import importlib
 import io
 import os
@@ -51,7 +52,6 @@
 import matplotlib.colors as colors
 import matplotlib.transforms as transforms
 import matplotlib.widgets as widgets
-#import matplotlib.path as path
 from matplotlib import rcParams
 from matplotlib import is_interactive
 from matplotlib import get_backend
@@ -2756,6 +2756,13 @@ def __init__(self, canvas):
         self.mode = ''  # a mode string for the status bar
         self.set_history_buttons()
 
+        @partial(canvas.mpl_connect, 'draw_event')
+        def define_home(event):
+            self.push_current()
+            # The decorator sets `define_home` to the callback cid, so we can
+            # disconnect it after the first use.
+            canvas.mpl_disconnect(define_home)
+
     def set_message(self, s):
         """Display a message on toolbar or in status bar"""
         pass
@@ -2906,11 +2913,6 @@ def press_pan(self, event):
             return
 
         x, y = event.x, event.y
-
-        # push the current view to define home if stack is empty
-        if self._views.empty():
-            self.push_current()
-
         self._xypress = []
         for i, a in enumerate(self.canvas.figure.get_axes()):
             if (x is not None and y is not None and a.in_axes(event) and
@@ -2946,11 +2948,6 @@ def press_zoom(self, event):
             return
 
         x, y = event.x, event.y
-
-        # push the current view to define home if stack is empty
-        if self._views.empty():
-            self.push_current()
-
         self._xypress = []
         for i, a in enumerate(self.canvas.figure.get_axes()):
             if (x is not None and y is not None and a.in_axes(event) and
diff --git a/lib/matplotlib/backends/qt_editor/figureoptions.py b/lib/matplotlib/backends/qt_editor/figureoptions.py
@@ -234,6 +234,7 @@ def apply_callback(data):
         # Redraw
         figure = axes.get_figure()
         figure.canvas.draw()
+        figure.canvas.toolbar.push_current()
 
     data = formlayout.fedit(datalist, title="Figure options", parent=parent,
                             icon=get_icon('qt4_editor_options.svg'),
