moved tex caching to class level

jdh2358 · jdh2358 · commit 7d6a6d2c977f · 2005-06-21T20:10:14.000Z
svn path=/trunk/matplotlib/; revision=1495
diff --git a/API_CHANGES b/API_CHANGES
@@ -1,3 +1,5 @@
+API Changes in matplotlib-0.82.1
+
   Moved Figure.get_width_height() to FigureCanvasBase. It now returns
   int instead of float.
 
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,5 +1,8 @@
 New entries should be added at the top
   
+2005-06-21 Moved some texmanager and backend_agg tex caching to class
+           level rather than instance level - JDH
+
 2005-06-20 setupext.py: fix problem where _nc_backend_gdk is installed to the
            wrong directory - SC
 
diff --git a/lib/matplotlib/axes.py b/lib/matplotlib/axes.py
@@ -1341,7 +1341,10 @@ def redraw_in_frame(self):
         """
         assert self._cachedRenderer is not None
         self.draw(self._cachedRenderer, inframe=True)
-        
+
+    def get_renderer_cache(self):
+        return self._cachedRenderer
+    
     def draw(self, renderer, inframe=False):
         "Draw everything (plot lines, axes, labels)"
         if not self.get_visible(): return
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -104,6 +104,7 @@ class RendererAgg(RendererBase):
     """
     
     debug=1
+    texd = {}  # a cache of tex image rasters
     def __init__(self, width, height, dpi):
         if __debug__: verbose.report('RendererAgg.__init__', 'debug-annoying')
         self.dpi = dpi
@@ -128,7 +129,7 @@ def __init__(self, width, height, dpi):
         self.cache = self._renderer.cache
         self.blit = self._renderer.blit
         self.texmanager = TexManager()
-        self.texd = {}  # a cache of tex image rasters
+
         self.bbox = lbwh_to_bbox(0,0, self.width, self.height)
         
 
diff --git a/lib/matplotlib/texmanager.py b/lib/matplotlib/texmanager.py
@@ -48,14 +48,17 @@ class TexManager:
     if path is None: path = get_data_path()
     texcache = os.path.join(path, '.tex.cache')
 
-    
+
+    dvipngVersion = None
+
+    arrayd = {}
+    postscriptd = {}
+    pscnt = 0
+
     def __init__(self):
         if not os.path.isdir(self.texcache):
             os.mkdir(self.texcache)
-        self.arrayd = {}
-        self.postscriptd = {}
-        self.pscnt = 0
-        self.dvipngVersion = None
+
         
     def get_prefix(self, tex):
         return md5.md5(tex).hexdigest()

Original file line number	Diff line number	Diff line change
`@@ -1,3 +1,5 @@`
	`1`	`+API Changes in matplotlib-0.82.1`
	`2`	`+`
`1`	`3`	`Moved Figure.get_width_height() to FigureCanvasBase. It now returns`
`2`	`4`	`int instead of float.`
`3`	`5`