Merged 'main/master'

Author: mdboom

CHANGELOG

@@ -1,3 +1,9 @@
+2011-04-14 interpolation="nearest" always interpolate images. A new
+           mode "none" is introduced for no interpolation - JJL
+
+2011-04-03 Fixed broken pick interface to AsteriskCollection objects
+           used by scatter. - EF
+
 2011-04-01 The plot directive Sphinx extension now supports all of the
            features in the Numpy fork of that extension.  These
            include doctest formatting, an 'include-source' option, and

lib/matplotlib/axes.py

@@ -2036,11 +2036,11 @@ def set_axisbelow(self, b):
         self._axisbelow = b
 
     @docstring.dedent_interpd
-    def grid(self, b=None, which='major', **kwargs):
+    def grid(self, b=None, which='major', axis='xy', **kwargs):
         """
         call signature::
 
-           grid(self, b=None, which='major', **kwargs)
+           grid(self, b=None, which='major', axis='xy', **kwargs)
 
         Set the axes grids on or off; *b* is a boolean.  (For MATLAB
         compatibility, *b* may also be a string, 'on' or 'off'.)
@@ -2052,6 +2052,9 @@ def grid(self, b=None, which='major', **kwargs):
         *which* can be 'major' (default), 'minor', or 'both' to control
         whether major tick grids, minor tick grids, or both are affected.
 
+        *axis* can be 'xy' (default), 'x', or 'y' to control which
+        set of gridlines are drawn.
+
         *kawrgs* are used to set the grid line properties, eg::
 
            ax.grid(color='r', linestyle='-', linewidth=2)
@@ -2064,8 +2067,11 @@ def grid(self, b=None, which='major', **kwargs):
         if len(kwargs):
             b = True
         b = _string_to_bool(b)
-        self.xaxis.grid(b, which=which, **kwargs)
-        self.yaxis.grid(b, which=which, **kwargs)
+
+        if axis == 'x' or  axis == 'xy':
+          self.xaxis.grid(b, which=which, **kwargs)
+        if axis == 'y' or  axis == 'xy':
+          self.yaxis.grid(b, which=which, **kwargs)
 
     def ticklabel_format(self, **kwargs):
         """

lib/matplotlib/collections.py

@@ -93,6 +93,7 @@ def __init__(self,
         self.set_linewidth(linewidths)
         self.set_linestyle(linestyles)
         self.set_antialiased(antialiaseds)
+        self.set_pickradius(pickradius)
         self.set_urls(urls)
 
 
@@ -109,7 +110,6 @@ def __init__(self,
             else:
                 self._uniform_offsets = offsets
 
-        self._pickradius = pickradius
         self.update(kwargs)
         self._paths = None
 
@@ -232,26 +232,48 @@ def draw(self, renderer):
         gc.restore()
         renderer.close_group(self.__class__.__name__)
 
+    def set_pickradius(self, pr):
+        self._pickradius = pr
+
+    def get_pickradius(self):
+        return self._pickradius
+
     def contains(self, mouseevent):
         """
         Test whether the mouse event occurred in the collection.
 
         Returns True | False, ``dict(ind=itemlist)``, where every
         item in itemlist contains the event.
         """
-        if callable(self._contains): return self._contains(self,mouseevent)
-        if not self.get_visible(): return False,{}
+        if callable(self._contains):
+            return self._contains(self,mouseevent)
+
+        if not self.get_visible():
+            return False, {}
+
+        if self._picker is True:  # the Boolean constant, not just nonzero or 1
+            pickradius = self._pickradius
+        else:
+            try:
+                pickradius = float(self._picker)
+            except TypeError:
+                # This should not happen if "contains" is called via
+                # pick, the normal route; the check is here in case
+                # it is called through some unanticipated route.
+                warnings.warn(
+                    "Collection picker %s could not be converted to float"
+                                        % self._picker)
+                pickradius = self._pickradius
 
         transform, transOffset, offsets, paths = self._prepare_points()
 
         ind = mpath.point_in_path_collection(
-            mouseevent.x, mouseevent.y, self._pickradius,
+            mouseevent.x, mouseevent.y, pickradius,
             transform.frozen(), paths, self.get_transforms(),
-            offsets, transOffset, len(self._facecolors)>0)
-        return len(ind)>0,dict(ind=ind)
+            offsets, transOffset, pickradius <= 0)
+
+        return len(ind)>0, dict(ind=ind)
 
-    def set_pickradius(self,pickradius): self.pickradius = 5
-    def get_pickradius(self): return self.pickradius
 
     def set_urls(self, urls):
         if urls is None:

lib/matplotlib/image.py

@@ -31,6 +31,7 @@ class _AxesImageBase(martist.Artist, cm.ScalarMappable):
     zorder = 0
     # map interpolation strings to module constants
     _interpd = {
+        'none'     : _image.NEAREST, # fall back to nearest when not supported
         'nearest'  : _image.NEAREST,
         'bilinear' : _image.BILINEAR,
         'bicubic'  : _image.BICUBIC,
@@ -446,10 +447,15 @@ def set_interpolation(self, s):
         """
         Set the interpolation method the image uses when resizing.
 
+        if None, use a value from rc setting. If 'none', the image is
+        shown as is without interpolating. 'none' is only supported in
+        agg, ps and pdf backends and will fall back to 'nearest' mode
+        for other backends.
+
         ACCEPTS: ['nearest' | 'bilinear' | 'bicubic' | 'spline16' |
           'spline36' | 'hanning' | 'hamming' | 'hermite' | 'kaiser' |
           'quadric' | 'catrom' | 'gaussian' | 'bessel' | 'mitchell' |
-          'sinc' | 'lanczos' | ]
+          'sinc' | 'lanczos' | 'none' |]
 
         """
         if s is None: s = rcParams['image.interpolation']
@@ -610,10 +616,13 @@ def _check_unsampled_image(self, renderer):
         """
         return True if the image is better to be drawn unsampled.
         """
-        if renderer.option_scale_image() and self.get_interpolation() == "nearest":
-            return True
-        else:
-            return False
+        if self.get_interpolation() == "none":
+            if renderer.option_scale_image():
+                return True
+            else:
+                warnings.warn("The backend (%s) does not support interpolation='none'. The image will be interpolated with 'nearest` mode." % (str(type(renderer))))
+
+        return False
 
     def set_extent(self, extent):
         """

lib/matplotlib/pylab.py

@@ -293,3 +293,6 @@ def save(*args, **kwargs):
 
 # don't let numpy's datetime hide stdlib
 import datetime
+
+if sys.version_info > (2, 6, 0):
+    bytes = __builtins__['bytes']

lib/matplotlib/pyplot.py

@@ -2645,8 +2645,8 @@ def cla():
 # This function was autogenerated by boilerplate.py.  Do not edit as
 # changes will be lost
 @docstring.copy_dedent(Axes.grid)
-def grid(b=None, which='major', **kwargs):
-    ret =  gca().grid(b, which, **kwargs)
+def grid(b=None, which='major', axis='xy', **kwargs):
+    ret =  gca().grid(b, which, axis, **kwargs)
     draw_if_interactive()
     return ret
 

lib/matplotlib/testing/decorators.py

@@ -88,10 +88,8 @@ def compare_images_generator():
             for extension in extensions:
                 orig_expected_fnames = [os.path.join(baseline_dir,fname) + '.' + extension for fname in baseline_images]
                 expected_fnames = [os.path.join(result_dir,'expected-'+fname) + '.' + extension for fname in baseline_images]
-                for src,dst in zip( orig_expected_fnames, expected_fnames ):
-                    shutil.copyfile(src,dst)
                 actual_fnames = [os.path.join(result_dir, fname) + '.' + extension for fname in baseline_images]
-                have_baseline_images = [os.path.exists(expected) for expected in expected_fnames]
+                have_baseline_images = [os.path.exists(expected) for expected in orig_expected_fnames]
                 have_baseline_image = np.all(have_baseline_images)
                 is_comparable = extension in comparable_formats()
                 if not is_comparable:
@@ -113,11 +111,12 @@ def decorated_compare_images():
                         result = func() # actually call the test function
                     finally:
                         os.chdir(old_dir)
-                    for actual,expected in zip(actual_fnames,expected_fnames):
-                        if not os.path.exists(expected):
+                    for original, expected in zip(orig_expected_fnames, expected_fnames):
+                        if not os.path.exists(original):
                             raise ImageComparisonFailure(
-                                'image does not exist: %s'%expected)
-
+                                'image does not exist: %s'%original)
+                        shutil.copyfile(original, expected)
+                    for actual,expected in zip(actual_fnames,expected_fnames):
                         # compare the images
                         err = compare_images( expected, actual, tol,
                                               in_decorator=True )