SF.net SVN: matplotlib: [4306] branches/transforms/lib/matplotlib

[<md...@us...>]

Revision: 4306
          http://matplotlib.svn.sourceforge.net/matplotlib/?rev=4306&view=rev
Author:   mdboom
Date:     2007-11-15 08:28:54 -0800 (Thu, 15 Nov 2007)

Log Message:
-----------
Speed improvements.

Modified Paths:
--------------
    branches/transforms/lib/matplotlib/backends/backend_tkagg.py
    branches/transforms/lib/matplotlib/transforms.py

Modified: branches/transforms/lib/matplotlib/backends/backend_tkagg.py
===================================================================
--- branches/transforms/lib/matplotlib/backends/backend_tkagg.py	2007-11-15 15:18:42 UTC (rev 4305)
+++ branches/transforms/lib/matplotlib/backends/backend_tkagg.py	2007-11-15 16:28:54 UTC (rev 4306)
@@ -146,7 +146,7 @@
 
     def __init__(self, figure, master=None, resize_callback=None):
         FigureCanvasAgg.__init__(self, figure)
-        self._idle = True
+        self._idle = False
         t1,t2,w,h = self.figure.bbox.bounds
         w, h = int(w), int(h)
         self._tkcanvas = Tk.Canvas(

Modified: branches/transforms/lib/matplotlib/transforms.py
===================================================================
--- branches/transforms/lib/matplotlib/transforms.py	2007-11-15 15:18:42 UTC (rev 4305)
+++ branches/transforms/lib/matplotlib/transforms.py	2007-11-15 16:28:54 UTC (rev 4306)
@@ -37,6 +37,8 @@
 if DEBUG:
     import warnings
 
+MaskedArray = ma.MaskedArray
+    
 class TransformNode(object):
     """
     TransformNode is the base class for anything that participates in
@@ -1205,7 +1207,7 @@
 
     def transform(self, points):
         mtx = self.get_matrix()
-        if ma.isMaskedArray(points):
+        if isinstance(points, MaskedArray):
             points = ma.dot(mtx[0:2, 0:2], points.transpose()) + mtx[0:2, 2:]
             return points.transpose()
         return affine_transform(points, mtx)
@@ -1526,7 +1528,7 @@
             y_points = y.transform(points[:, 1])
             y_points = y_points.reshape((len(y_points), 1))
 
-        if ma.isMaskedArray(x_points) or ma.isMaskedArray(y_points):
+        if isinstance(x_points, MaskedArray) or isinstance(y_points, MaskedArray):
             return ma.concatenate((x_points, y_points), 1)
         else:
             return npy.concatenate((x_points, y_points), 1)


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.