add figure on trigger to make sure axes are already populated

Federico Ariza · Federico Ariza · commit 54ddc90a4cd3 · 2016-05-17T17:03:06.000-04:00
diff --git a/lib/matplotlib/backend_tools.py b/lib/matplotlib/backend_tools.py
@@ -484,16 +484,16 @@ def __init__(self, *args, **kwargs):
         self.home_views = WeakKeyDictionary()
         ToolBase.__init__(self, *args, **kwargs)
 
-    def set_figure(self, figure):
-        self._figure = figure
-        if figure not in self.views:
-            self.views[figure] = cbook.Stack()
-            self.positions[figure] = cbook.Stack()
-            self.home_views[figure] = WeakKeyDictionary()
+    def add_figure(self):
+        """Add the current figure to the stack of views and positions"""
+        if self.figure not in self.views:
+            self.views[self.figure] = cbook.Stack()
+            self.positions[self.figure] = cbook.Stack()
+            self.home_views[self.figure] = WeakKeyDictionary()
             # Define Home
             self.push_current()
             # Make sure we add a home view for new axes as they're added
-            figure.add_axobserver(lambda fig: self.update_home_views())
+            self.figure.add_axobserver(lambda fig: self.update_home_views())
 
     def clear(self, figure):
         """Reset the axes stack"""
@@ -618,6 +618,7 @@ class ViewsPositionsBase(ToolBase):
     _on_trigger = None
 
     def trigger(self, sender, event, data=None):
+        self.toolmanager.get_tool(_views_positions).add_figure()
         getattr(self.toolmanager.get_tool(_views_positions),
                 self._on_trigger)()
         self.toolmanager.get_tool(_views_positions).update_view()
@@ -697,6 +698,7 @@ def disable(self, event):
         self.figure.canvas.mpl_disconnect(self._idScroll)
 
     def trigger(self, sender, event, data=None):
+        self.toolmanager.get_tool(_views_positions).add_figure()
         ToolToggleBase.trigger(self, sender, event, data)
 
     def scroll_zoom(self, event):
