BUG: PcolorImage handles non-contiguous arrays, provides data readout

efiring · efiring · commit b52541ddb797 · 2016-08-08T16:19:07.000-10:00
diff --git a/lib/matplotlib/image.py b/lib/matplotlib/image.py
@@ -897,6 +897,7 @@ def set_cmap(self, cmap):
         super(NonUniformImage, self).set_cmap(cmap)
 
 
+
 class PcolorImage(AxesImage):
     """
     Make a pcolor-style plot with an irregular rectangular grid.
@@ -985,6 +986,15 @@ def set_data(self, x, y, A):
                     self.is_grayscale = True
             else:
                 raise ValueError("3D arrays must have RGB or RGBA as last dim")
+
+        # For efficient cursor readout, ensure x and y are increasing.
+        if x[-1] < x[0]:
+            x = x[::-1]
+            A = A[:, ::-1]
+        if y[-1] < y[0]:
+            y = y[::-1]
+            A = A[::-1]
+
         self._A = A
         self._Ax = x
         self._Ay = y
@@ -994,6 +1004,19 @@ def set_data(self, x, y, A):
     def set_array(self, *args):
         raise NotImplementedError('Method not supported')
 
+    def get_cursor_data(self, event):
+        """Get the cursor data for a given event"""
+        x, y = event.xdata, event.ydata
+        if (x < self._Ax[0] or x > self._Ax[-1] or
+                y < self._Ay[0] or y > self._Ay[-1]):
+            return None
+        j = np.searchsorted(self._Ax, x) - 1
+        i = np.searchsorted(self._Ay, y) - 1
+        try:
+            return self._A[i, j]
+        except:
+            return None
+
 
 class FigureImage(_ImageBase):
     zorder = 0
diff --git a/src/_image_wrapper.cpp b/src/_image_wrapper.cpp
@@ -411,9 +411,9 @@ static PyObject *image_pcolor2(PyObject *self, PyObject *args, PyObject *kwds)
 
     if (!PyArg_ParseTuple(args,
                           "O&O&O&II(ffff)O&:pcolor2",
-                          &x.converter,
+                          &x.converter_contiguous,
                           &x,
-                          &y.converter,
+                          &y.converter_contiguous,
                           &y,
                           &d.converter_contiguous,
                           &d,
