Merge remote-tracking branch 'upstream/v1.3.x'

mdboom · mdboom · commit 38fd46296722 · 2013-12-30T09:10:24.000-05:00
Conflicts:
	lib/matplotlib/tests/test_colors.py
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -1317,6 +1317,7 @@ def tk_window_focus():
     'matplotlib.tests.test_dates',
     'matplotlib.tests.test_delaunay',
     'matplotlib.tests.test_figure',
+    'matplotlib.tests.test_gridspec',
     'matplotlib.tests.test_image',
     'matplotlib.tests.test_legend',
     'matplotlib.tests.test_lines',
diff --git a/lib/matplotlib/backends/backend_gtk3.py b/lib/matplotlib/backends/backend_gtk3.py
@@ -434,7 +434,6 @@ def destroy(self, *args):
         self.canvas.destroy()
         if self.toolbar:
             self.toolbar.destroy()
-        self.__dict__.clear()   #Is this needed? Other backends don't have it.
 
         if Gcf.get_num_fig_managers()==0 and \
                not matplotlib.is_interactive() and \
diff --git a/lib/matplotlib/backends/backend_pgf.py b/lib/matplotlib/backends/backend_pgf.py
@@ -174,12 +174,9 @@ def make_pdf_to_png_converter():
     except:
         pass
     # check for ghostscript
-    try:
-        gs = "gs" if sys.platform != "win32" else "gswin32c"
-        check_output([gs, "-v"], stderr=subprocess.STDOUT)
+    gs, ver = mpl.checkdep_ghostscript()
+    if gs:
         tools_available.append("gs")
-    except:
-        pass
 
     # pick converter
     if "pdftocairo" in tools_available:
diff --git a/lib/matplotlib/colors.py b/lib/matplotlib/colors.py
@@ -1236,39 +1236,98 @@ def inverse(self, value):
 
 def rgb_to_hsv(arr):
     """
-    convert rgb values in a numpy array to hsv values
-    input and output arrays should have shape (M,N,3)
+    convert float rgb values (in the range [0, 1]), in a numpy array to hsv
+    values.
+
+    Parameters
+    ----------
+    arr : (..., 3) array-like
+       All values must be in the range [0, 1]
+
+    Returns
+    -------
+    hsv : (..., 3) ndarray
+       Colors converted to hsv values in range [0, 1]
     """
-    out = np.zeros(arr.shape, dtype=np.float)
+    # make sure it is an ndarray
+    arr = np.asarray(arr)
+
+    # check length of the last dimension, should be _some_ sort of rgb
+    if arr.shape[-1] != 3:
+        raise ValueError("Last dimension of input array must be 3; "
+                         "shape {shp} was found.".format(shp=arr.shape))
+
+    in_ndim = arr.ndim
+    if arr.ndim == 1:
+        arr = np.array(arr, ndmin=2)
+
+    # make sure we don't have an int image
+    if arr.dtype.kind in ('iu'):
+        arr = arr.astype(np.float32)
+
+    out = np.zeros_like(arr)
     arr_max = arr.max(-1)
     ipos = arr_max > 0
     delta = arr.ptp(-1)
     s = np.zeros_like(delta)
     s[ipos] = delta[ipos] / arr_max[ipos]
     ipos = delta > 0
     # red is max
-    idx = (arr[:, :, 0] == arr_max) & ipos
+    idx = (arr[..., 0] == arr_max) & ipos
     out[idx, 0] = (arr[idx, 1] - arr[idx, 2]) / delta[idx]
     # green is max
-    idx = (arr[:, :, 1] == arr_max) & ipos
+    idx = (arr[..., 1] == arr_max) & ipos
     out[idx, 0] = 2. + (arr[idx, 2] - arr[idx, 0]) / delta[idx]
     # blue is max
-    idx = (arr[:, :, 2] == arr_max) & ipos
+    idx = (arr[..., 2] == arr_max) & ipos
     out[idx, 0] = 4. + (arr[idx, 0] - arr[idx, 1]) / delta[idx]
-    out[:, :, 0] = (out[:, :, 0] / 6.0) % 1.0
-    out[:, :, 1] = s
-    out[:, :, 2] = arr_max
+
+    out[..., 0] = (out[..., 0] / 6.0) % 1.0
+    out[..., 1] = s
+    out[..., 2] = arr_max
+
+    if in_ndim == 1:
+        out.shape = (3,)
+
     return out
 
 
 def hsv_to_rgb(hsv):
     """
     convert hsv values in a numpy array to rgb values
-    both input and output arrays have shape (M,N,3)
+    all values assumed to be in range [0, 1]
+
+    Parameters
+    ----------
+    hsv : (..., 3) array-like
+       All values assumed to be in range [0, 1]
+
+    Returns
+    -------
+    rgb : (..., 3) ndarray
+       Colors converted to RGB values in range [0, 1]
     """
-    h = hsv[:, :, 0]
-    s = hsv[:, :, 1]
-    v = hsv[:, :, 2]
+        # make sure it is an ndarray
+    hsv = np.asarray(hsv)
+
+    # check length of the last dimension, should be _some_ sort of rgb
+    if hsv.shape[-1] != 3:
+        raise ValueError("Last dimension of input array must be 3; "
+                            "shape {shp} was found.".format(shp=hsv.shape))
+
+    # if we got pased a 1D array, try to treat as
+    # a single color and reshape as needed
+    in_ndim = hsv.ndim
+    if in_ndim == 1:
+        hsv = np.array(hsv, ndmin=2)
+
+    # make sure we don't have an int image
+    if hsv.dtype.kind in ('iu'):
+        hsv = hsv.astype(np.float32)
+
+    h = hsv[..., 0]
+    s = hsv[..., 1]
+    v = hsv[..., 2]
 
     r = np.empty_like(h)
     g = np.empty_like(h)
@@ -1316,9 +1375,13 @@ def hsv_to_rgb(hsv):
     b[idx] = v[idx]
 
     rgb = np.empty_like(hsv)
-    rgb[:, :, 0] = r
-    rgb[:, :, 1] = g
-    rgb[:, :, 2] = b
+    rgb[..., 0] = r
+    rgb[..., 1] = g
+    rgb[..., 2] = b
+
+    if in_ndim == 1:
+        rgb.shape = (3, )
+
     return rgb
 
 
diff --git a/lib/matplotlib/gridspec.py b/lib/matplotlib/gridspec.py
@@ -461,3 +461,19 @@ def get_topmost_subplotspec(self):
             return gridspec.get_topmost_subplotspec()
         else:
             return self
+
+    def __eq__(self, other):
+        # check to make sure other has the attributes
+        # we need to do the comparison
+        if not (hasattr(other, '_gridspec') and
+                hasattr(other, 'num1') and
+                hasattr(other, 'num2')):
+            return False
+        return all((self._gridspec == other._gridspec,
+                    self.num1 == other.num1,
+                    self.num2 == other.num2))
+
+    def __hash__(self):
+        return (hash(self._gridspec) ^
+                hash(self.num1) ^
+                hash(self.num2))
diff --git a/lib/matplotlib/tests/test_colors.py b/lib/matplotlib/tests/test_colors.py
@@ -184,6 +184,16 @@ def test_cmap_and_norm_from_levels_and_colors2():
     assert_raises(ValueError, mcolors.from_levels_and_colors, levels, colors)
 
 
+def test_rgb_hsv_round_trip():
+    for a_shape in [(500, 500, 3), (500, 3), (1, 3), (3,)]:
+        np.random.seed(0)
+        tt = np.random.random(a_shape)
+        assert_array_almost_equal(tt,
+            mcolors.hsv_to_rgb(mcolors.rgb_to_hsv(tt)))
+        assert_array_almost_equal(tt,
+            mcolors.rgb_to_hsv(mcolors.hsv_to_rgb(tt)))
+
+
 @cleanup
 def test_autoscale_masked():
     # Test for #2336. Previously fully masked data would trigger a ValueError.
diff --git a/lib/matplotlib/tests/test_gridspec.py b/lib/matplotlib/tests/test_gridspec.py
@@ -0,0 +1,8 @@
+import matplotlib.gridspec as gridspec
+from nose.tools import assert_equal
+
+
+def test_equal():
+    gs = gridspec.GridSpec(2, 1)
+    assert_equal(gs[0, 0], gs[0, 0])
+    assert_equal(gs[:, 0], gs[:, 0])
