Merged revisions 6589,6608-6609 via svnmerge from

mdboom · mdboom · commit 5b19dc35c3cb · 2008-12-15T14:21:15.000Z
https://matplotlib.svn.sf.net/svnroot/matplotlib/branches/v0_98_5_maint ........ r6589 | mmetz_bn | 2008-12-12 08:58:24 -0500 (Fri, 12 Dec 2008) | 1 line fix warning in hist for numpy 1.2 ........ r6608 | mdboom | 2008-12-15 09:16:27 -0500 (Mon, 15 Dec 2008) | 2 lines Fix gridlines not moving correctly during pan and zoom ........ r6609 | mdboom | 2008-12-15 09:18:03 -0500 (Mon, 15 Dec 2008) | 2 lines Turn off anti-aliasing when auto-snapping. ........ svn path=/trunk/matplotlib/; revision=6610
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,7 @@
+2008-12-15 Fix anti-aliasing when auto-snapping - MGD
+
+2008-12-15 Fix grid lines not moving correctly during pan and zoom - MGD
+
 2008-12-12 Preparations to eliminate maskedarray rcParams key: its
            use will now generate a warning.  Similarly, importing
            the obsolote numerix.npyma will generate a warning. - EF
diff --git a/lib/matplotlib/transforms.py b/lib/matplotlib/transforms.py
@@ -120,8 +120,7 @@ def invalidate(self):
             root = stack.pop()
             # Stop at subtrees that have already been invalidated
             if root._invalid != value or root.pass_through:
-                value |= root._invalid
-                root._invalid = value
+                root._invalid = self.INVALID
                 stack.extend(root._parents.keys())
 
     def set_children(self, *children):
diff --git a/src/_backend_agg.cpp b/src/_backend_agg.cpp
@@ -355,7 +355,7 @@ RendererAgg::_get_rgba_face(const Py::Object& rgbFace, double alpha) {
 }
 
 template<class Path>
-bool should_snap(const GCAgg& gc, Path& path, const agg::trans_affine& trans) {
+bool should_snap(GCAgg& gc, Path& path, const agg::trans_affine& trans) {
   // If this contains only straight horizontal or vertical lines, it should be
   // quantized to the nearest pixels
   double x0, y0, x1, y1;
@@ -393,6 +393,7 @@ bool should_snap(const GCAgg& gc, Path& path, const agg::trans_affine& trans) {
     }
 
     path.rewind(0);
+    gc.isaa = false;
     return true;
   case GCAgg::SNAP_FALSE:
     return false;

Original file line number	Diff line number	Diff line change
`@@ -355,7 +355,7 @@ RendererAgg::_get_rgba_face(const Py::Object& rgbFace, double alpha) {`
`355`	`355`	`}`
`356`	`356`
`357`	`357`	`template<class Path>`
`358`		`-bool should_snap(const GCAgg& gc, Path& path, const agg::trans_affine& trans) {`
	`358`	`+bool should_snap(GCAgg& gc, Path& path, const agg::trans_affine& trans) {`
`359`	`359`	`// If this contains only straight horizontal or vertical lines, it should be`
`360`	`360`	`// quantized to the nearest pixels`
`361`	`361`	`double x0, y0, x1, y1;`
`@@ -393,6 +393,7 @@ bool should_snap(const GCAgg& gc, Path& path, const agg::trans_affine& trans) {`
`393`	`393`	`}`
`394`	`394`
`395`	`395`	`path.rewind(0);`
	`396`	`+ gc.isaa = false;`
`396`	`397`	`return true;`
`397`	`398`	`case GCAgg::SNAP_FALSE:`
`398`	`399`	`return false;`