Replace old spy and spy2 with new spy (briefly called spy3)

efiring · efiring · commit e88094a5679c · 2006-12-10T07:57:50.000Z
svn path=/trunk/matplotlib/; revision=2915
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2006-12-09 Replaced spy and spy2 with the new spy that combines
+           marker and image capabilities - EF
+
 2006-12-09 Added support for plotting 2-D arrays with plot:
            columns are plotted as in Matlab - EF
 
diff --git a/boilerplate.py b/boilerplate.py
@@ -78,7 +78,6 @@ def %(func)s(*args, **kwargs):
     'semilogy',
     'specgram',
     'spy',
-    'spy2',
     'stem',
     'vlines',
     'quiver',
@@ -102,7 +101,7 @@ def %(func)s(*args, **kwargs):
     'pcolor'  : 'gci._current = ret',
     'pcolormesh'  : 'gci._current = ret',
     'imshow'  : 'gci._current = ret',
-    'spy2'    : 'gci._current = ret',
+    'spy'    : 'gci._current = ret',
     'quiver2' : 'gci._current = ret',
     'quiver' : 'gci._current = ret',
     'specgram'  : 'gci._current = ret[-1]',
diff --git a/examples/spy_demos.py b/examples/spy_demos.py
@@ -17,7 +17,7 @@
 ax1.spy(x, markersize=5)
 ax2.spy(x, precision=0.1, markersize=5)
 
-ax3.spy2(x, aspect='auto', origin='lower')
-ax4.spy2(x, precision=0.1, aspect='auto', origin='lower')
+ax3.spy(x)
+ax4.spy(x, precision=0.1)
 
 show()
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -4397,66 +4397,7 @@ def specgram(self, x, NFFT=256, Fs=2, detrend=detrend_none,
 
         return Pxx, freqs, bins, im
 
-    def spy(self, Z,  marker='s', markersize=10, precision=None, **kwargs):
-        """
-        SPY(Z, **kwargs) plots the sparsity pattern of the matrix Z
-        using plot markers.
-
-        The line handles are returned
-
-        if precision is None, any non-zero value will be plotted
-        if precision is not None, values of absolute(Z)>precision will be plotted
-
-        kwargs control the Line2D properties of the markers:
-%(Line2D)s
-        """
-        if hasattr(Z, 'tocoo'):
-            c = Z.tocoo()
-            x = c.row
-            y = c.col
-            z = c.data
-        else:
-            Z = asarray(Z)
-            if precision is None: mask = Z!=0.
-            else:                 mask = absolute(Z)>precision
-            x,y,z = matplotlib.mlab.get_xyz_where(Z, mask)
-        return self.plot(x+0.5,y+0.5, linestyle='None',
-                         marker=marker,markersize=markersize, **kwargs)
-    spy.__doc__ = spy.__doc__%artist.kwdocd
-
-    def spy2(self, Z, precision=None, **kwargs):
-        """
-        SPY2(Z) plots the sparsity pattern of the matrix Z as an image
-
-        if precision is None, any non-zero value will be plotted
-        if precision is not None, values of absolute(Z)>precision will be plotted
-
-        kwargs are passed on to imshow; see help imshow for valid kwargs
-
-        The image instance is returned
-        """
-
-        #binary colormap min white, max black
-        Z = asarray(Z)
-
-        if precision is None: mask = Z!=0.
-        else:                 mask = absolute(Z)>precision
-
-        Z = where(mask, 1., 0.)
-
-        kwargs = kwargs.copy()
-        if 'cmap' not in kwargs:
-            cmapdata = {
-                'red'  :  ((0., 1., 1.), (1., 0., 0.)),
-                'green':  ((0., 1., 1.), (1., 0., 0.)),
-                'blue' :  ((0., 1., 1.), (1., 0., 0.))
-                }
-            binary =  LinearSegmentedColormap('binary',  cmapdata, 2)
-            kwargs['cmap'] = binary
-
-        return self.imshow(transpose(Z), interpolation='nearest', **kwargs)
-
-    def spy3(self, Z, precision=None, marker=None, markersize=None,
+    def spy(self, Z, precision=None, marker=None, markersize=None,
                                     aspect='equal', **kwargs):
         """
         spy(Z) plots the sparsity pattern of the 2-D array Z
diff --git a/lib/matplotlib/pylab.py b/lib/matplotlib/pylab.py
