made the rc warnings a bit more readable

jdh2358 · jdh2358 · commit e7b3b73a3d9e · 2006-02-27T15:01:33.000Z
svn path=/trunk/matplotlib/; revision=2098
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,6 @@
+2006-02-27 Made the rc deprecation warnings a little more human
+           readable.
+
 2006-02-26 Update the previous gtk.main_quit() bug fix to use gtk.main_level()
            - SC
 
diff --git a/agg23/include/agg_rasterizer_scanline_aa.h b/agg23/include/agg_rasterizer_scanline_aa.h
@@ -28,7 +28,6 @@
 //----------------------------------------------------------------------------
 #ifndef AGG_RASTERIZER_SCANLINE_AA_INCLUDED
 #define AGG_RASTERIZER_SCANLINE_AA_INCLUDED
-
 #include <string.h>
 #include <math.h>
 #include "agg_basics.h"
@@ -460,12 +459,12 @@ namespace agg
         {
             double x;
             double y;
-
             unsigned cmd;
             vs.rewind(path_id);
+	    //boyle freeze appears to be in !is_stop(cmd = vs.vertex(&x, &y))
             while(!is_stop(cmd = vs.vertex(&x, &y)))
             {
-                add_vertex(x, y, cmd);
+	      add_vertex(x, y, cmd);
             }
         }
 
diff --git a/examples/simple_plot.py b/examples/simple_plot.py
@@ -15,6 +15,6 @@
 grid(True)
 
 #savefig('simple_plot.png')
-#savefig('simple_plot')
+savefig('simple_plot')
 
 show()
diff --git a/lib/matplotlib/__init__.py b/lib/matplotlib/__init__.py
@@ -908,7 +908,12 @@ def validate_key(key, val, line, cnt, fname, fail_on_error):
         key = alt
 
     if not defaultParams.has_key(key):
-        warnings.warn('Bad key "%s" on line %d in %s' % (key, cnt, fname))
+        print >> sys.stderr, """\
+Bad key "%s" on line %d in
+%s.
+You probably need to get an updated matplotlibrc file from
+http://matplotlib.sf.net/matplotlibrc or from the matplotlib src
+distribution""" % (key, cnt, fname)
         return None
 
     default, converter =  defaultParams[key]
diff --git a/lib/matplotlib/backends/backend_agg.py b/lib/matplotlib/backends/backend_agg.py
@@ -112,8 +112,10 @@ def __init__(self, width, height, dpi):
         self.dpi = dpi
         self.width = width
         self.height = height
+        if __debug__: verbose.report('RendererAgg.__init__ width=%s, height=%s'%(width, height), 'debug-annoying')
         self._renderer = _RendererAgg(int(width), int(height), dpi.get(),
                                     debug=False)
+        if __debug__: verbose.report('RendererAgg.__init__ _RendererAgg done', 'debug-annoying')
         self.draw_polygon = self._renderer.draw_polygon
         self.draw_rectangle = self._renderer.draw_rectangle
         self.draw_path = self._renderer.draw_path
@@ -132,9 +134,10 @@ def __init__(self, width, height, dpi):
         self.texmanager = TexManager()
 
         self.bbox = lbwh_to_bbox(0,0, self.width, self.height)
+        if __debug__: verbose.report('RendererAgg.__init__ done', 'debug-annoying')
 
     def draw_arc(self, gcEdge, rgbFace, x, y, width, height, angle1, angle2):
-        """
+        """        
         Draw an arc centered at x,y with width and height and angles
         from 0.0 to 360.0
 
diff --git a/lib/matplotlib/backends/backend_emf.py b/lib/matplotlib/backends/backend_emf.py
@@ -8,6 +8,7 @@
 try:
     import pyemf
 except ImportError:
+    import sys
     print >>sys.stderr, 'You must first install pyemf from http://pyemf.sf.net'
     sys.exit()
 
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -1328,14 +1328,15 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
       path.line_to(thisx, thisy);
 
     moveto = false;
-
+    //std::cout << "draw lines " << thisx << " " << thisy << std::endl;
   }
 
   Py_XDECREF(xa);
   Py_XDECREF(ya);
 
   //typedef agg::conv_transform<agg::path_storage, agg::trans_affine> path_t;
   //path_t transpath(path, xytrans);
+  _VERBOSE("RendererAgg::draw_lines rendering lines path");
   _render_lines_path(path, gc);
 
   _VERBOSE("RendererAgg::draw_lines DONE");
@@ -1346,15 +1347,15 @@ RendererAgg::draw_lines(const Py::Tuple& args) {
 template<class PathSource>
 void
 RendererAgg::_render_lines_path(PathSource &path, const GCAgg& gc) {
-
+  _VERBOSE("RendererAgg::_render_lines_path");
   typedef PathSource path_t;
   //typedef agg::conv_transform<agg::path_storage, agg::trans_affine> path_t;
   typedef agg::conv_stroke<path_t> stroke_t;
   typedef agg::conv_dash<path_t> dash_t;
 
   //path_t transpath(path, xytrans);
 
-  if (gc.dasha==NULL ) { //no dashes
+  if (gc.dasha==NULL ) { //no dashes    
     stroke_t stroke(path);
     stroke.width(gc.linewidth);
     stroke.line_cap(gc.cap);
@@ -1374,8 +1375,7 @@ RendererAgg::_render_lines_path(PathSource &path, const GCAgg& gc) {
     stroke.line_cap(gc.cap);
     stroke.line_join(gc.join);
     stroke.width(gc.linewidth);
-    theRasterizer->add_path(stroke);
-
+    theRasterizer->add_path(stroke); //boyle freeze is herre
   }
 
   if ( gc.isaa ) {
@@ -1386,7 +1386,6 @@ RendererAgg::_render_lines_path(PathSource &path, const GCAgg& gc) {
     rendererBin->color(gc.color);
     agg::render_scanlines(*theRasterizer, *slineBin, *rendererBin);
   }
-
 }
 
 /*

Original file line number	Diff line number	Diff line change
`@@ -28,7 +28,6 @@`
`28`	`28`	`//----------------------------------------------------------------------------`
`29`	`29`	`#ifndef AGG_RASTERIZER_SCANLINE_AA_INCLUDED`
`30`	`30`	`#define AGG_RASTERIZER_SCANLINE_AA_INCLUDED`
`31`		`-`
`32`	`31`	`#include <string.h>`
`33`	`32`	`#include <math.h>`
`34`	`33`	`#include "agg_basics.h"`
`@@ -460,12 +459,12 @@ namespace agg`
`460`	`459`	`{`
`461`	`460`	`double x;`
`462`	`461`	`double y;`
`463`		`-`
`464`	`462`	`unsigned cmd;`
`465`	`463`	`vs.rewind(path_id);`
	`464`	`+ //boyle freeze appears to be in !is_stop(cmd = vs.vertex(&x, &y))`
`466`	`465`	`while(!is_stop(cmd = vs.vertex(&x, &y)))`
`467`	`466`	`{`
`468`		`- add_vertex(x, y, cmd);`
	`467`	`+ add_vertex(x, y, cmd);`
`469`	`468`	`}`
`470`	`469`	`}`
`471`	`470`