Merge remote-tracking branch 'matplotlib/v2.1.x'

tacaswell · tacaswell · commit 168486bf6dc6 · 2018-01-05T23:41:10.000-05:00
Conflicts:
	doc/_templates/citing.html
	  - moved to citing.rst, added entry for 2.1.1
	doc/devel/contributing.rst
	  - kept version on master (which has extra paragraph)
	lib/matplotlib/axes/_axes.py
          - looks like a git merge issue, both versions are identical
diff --git a/doc/citing.rst b/doc/citing.rst
@@ -27,7 +27,9 @@ publication, please acknowledge this fact by citing `Hunter et al (2007)
 
 DOIs
 ----
-
+v2.1.1
+   .. image:: https://zenodo.org/badge/DOI/10.5281/zenodo.1098480.svg
+      :target: https://doi.org/10.5281/zenodo.1098480
 v2.1.0
    .. image:: https://zenodo.org/badge/doi/10.5281/zenodo.1004650.svg
       :target: https://doi.org/10.5281/zenodo.1004650
diff --git a/lib/matplotlib/backends/backend_qt5agg.py b/lib/matplotlib/backends/backend_qt5agg.py
@@ -35,6 +35,7 @@ def __init__(self, figure):
         super(FigureCanvasQTAggBase, self).__init__(figure=figure)
         self.setAttribute(QtCore.Qt.WA_OpaquePaintEvent)
         self._agg_draw_pending = False
+        self._agg_is_drawing = False
         self._bbox_queue = []
         self._drawRect = None
 
@@ -124,7 +125,14 @@ def draw(self):
         """
         # The Agg draw is done here; delaying causes problems with code that
         # uses the result of the draw() to update plot elements.
-        super(FigureCanvasQTAggBase, self).draw()
+        if self._agg_is_drawing:
+            return
+
+        self._agg_is_drawing = True
+        try:
+            super(FigureCanvasQTAggBase, self).draw()
+        finally:
+            self._agg_is_drawing = False
         self.update()
 
     def draw_idle(self):
@@ -135,7 +143,7 @@ def draw_idle(self):
         # current event loop in order to ensure thread affinity and to
         # accumulate multiple draw requests from event handling.
         # TODO: queued signal connection might be safer than singleShot
-        if not self._agg_draw_pending:
+        if not (self._agg_draw_pending or self._agg_is_drawing):
             self._agg_draw_pending = True
             QtCore.QTimer.singleShot(0, self.__draw_idle_agg)
 
@@ -146,6 +154,7 @@ def __draw_idle_agg(self, *args):
         # we have now tried this function at least once, do not run
         # again until re-armed.  Doing this here rather than after
         # protects against recursive calls triggered through self.draw
+        # The recursive call is via `repaintEvent`
         self._agg_draw_pending = False
         # if negative size, bail
         if self.height() < 0 or self.width() < 0:
