Sticky margins support for contour.

anntzer · anntzer · commit f4f9e75e6588 · 2016-11-17T11:21:30.000-08:00
diff --git a/lib/matplotlib/contour.py b/lib/matplotlib/contour.py
@@ -766,6 +766,7 @@ class ContourSet(cm.ScalarMappable, ContourLabeler):
         same as levels for line contours; half-way between
         levels for filled contours.  See :meth:`_process_colors`.
     """
+
     def __init__(self, ax, *args, **kwargs):
         """
         Draw contour lines or filled regions, depending on
@@ -804,7 +805,7 @@ def __init__(self, ax, *args, **kwargs):
             level0segs = [polygon0] and level0kinds = [polygon0kinds].
 
         Keyword arguments are as described in
-        :class:`~matplotlib.contour.QuadContourSet` object.
+        :attr:`matplotlib.contour.QuadContourSet.contour_doc`.
 
         **Examples:**
 
@@ -937,8 +938,7 @@ def __init__(self, ax, *args, **kwargs):
                     edgecolors='none',
                     alpha=self.alpha,
                     transform=self.get_transform(),
-                    zorder=zorder,
-                    margins=False)
+                    zorder=zorder)
                 self.ax.add_collection(col, autolim=False)
                 self.collections.append(col)
         else:
@@ -959,11 +959,18 @@ def __init__(self, ax, *args, **kwargs):
                     linestyles=[lstyle],
                     alpha=self.alpha,
                     transform=self.get_transform(),
-                    zorder=zorder,
-                    margins=False)
+                    zorder=zorder)
                 col.set_label('_nolegend_')
                 self.ax.add_collection(col, autolim=False)
                 self.collections.append(col)
+
+        mins, maxs = self._stickies
+        for col in self.collections:
+            col.stickies.x[:] = [mins[0], maxs[0]]
+            col.stickies.y[:] = [mins[1], maxs[1]]
+        self.ax.update_datalim([mins, maxs])
+        self.ax.autoscale_view(tight=True)
+
         self.changed()  # set the colors
 
     def get_transform(self):
@@ -1069,21 +1076,13 @@ def _process_args(self, *args, **kwargs):
             raise ValueError('allkinds has different length to allsegs')
 
         # Determine x,y bounds and update axes data limits.
-        havelimits = False
-        for segs in self.allsegs:
-            for seg in segs:
-                seg = np.asarray(seg)
-                if havelimits:
-                    min = np.minimum(min, seg.min(axis=0))
-                    max = np.maximum(max, seg.max(axis=0))
-                else:
-                    min = seg.min(axis=0)
-                    max = seg.max(axis=0)
-                    havelimits = True
-
-        if havelimits:
-            self.ax.update_datalim([min, max])
-            self.ax.autoscale_view(tight=True)
+        mins = np.min(
+            [np.min(seg, axis=0) for segs in self.allsegs for seg in segs],
+            axis=0)
+        maxs = np.max(
+            [np.max(seg, axis=0) for segs in self.allsegs for seg in segs],
+            axis=0)
+        self._stickies = [mins, maxs]
 
     def _get_allsegs_and_allkinds(self):
         """
@@ -1423,16 +1422,6 @@ class QuadContourSet(ContourSet):
         Same as levels for line contours; half-way between
         levels for filled contours.  See :meth:`_process_colors` method.
     """
-    def __init__(self, ax, *args, **kwargs):
-        """
-        Calculate and draw contour lines or filled regions, depending
-        on whether keyword arg 'filled' is False (default) or True.
-
-        The first argument of the initializer must be an axes
-        object.  The remaining arguments and keyword arguments
-        are described in QuadContourSet.contour_doc.
-        """
-        ContourSet.__init__(self, ax, *args, **kwargs)
 
     def _process_args(self, *args, **kwargs):
         """
@@ -1448,6 +1437,7 @@ def _process_args(self, *args, **kwargs):
                 contour_generator = args[0].Cntr
             else:
                 contour_generator = args[0]._contour_generator
+            self._stickies = args[0]._stickies
         else:
             self._corner_mask = kwargs.get('corner_mask', None)
             if self._corner_mask is None:
@@ -1484,8 +1474,7 @@ def _process_args(self, *args, **kwargs):
             x1 = ma.maximum(x)
             y0 = ma.minimum(y)
             y1 = ma.maximum(y)
-            self.ax.update_datalim([(x0, y0), (x1, y1)])
-            self.ax.autoscale_view(tight=True)
+            self._stickies = [(x0, y0), (x1, y1)]
 
         if self._corner_mask == 'legacy':
             self.Cntr = contour_generator
