Fix path simplification by a) making it more conservative about when it will simplify based on segment length, and b) honoring path.simplify rcParam in Agg backend.

mdboom · mdboom · commit cdbbd94d1867 · 2008-12-29T14:42:20.000Z
svn path=/trunk/matplotlib/; revision=6712
diff --git a/lib/matplotlib/config/rcsetup.py b/lib/matplotlib/config/rcsetup.py
@@ -479,7 +479,7 @@ def __call__(self, s):
     'svg.embed_char_paths' : [True, validate_bool],  # True to save all characters as paths in the SVG
     'plugins.directory' : ['.matplotlib_plugins', str], # where plugin directory is locate
 
-    'path.simplify' : [False, validate_bool]
+    'path.simplify' : [True, validate_bool]
 }
 
 if __name__ == '__main__':
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -109,8 +109,9 @@ def __init__(self, vertices, codes=None):
         assert vertices.ndim == 2
         assert vertices.shape[1] == 2
 
-        self.should_simplify = (len(vertices) >= 128 and
-                                (codes is None or np.all(codes <= Path.LINETO)))
+        self.should_simplify = (rcParam['path.simplify'] and
+                                (len(vertices) >= 128 and
+                                (codes is None or np.all(codes <= Path.LINETO))))
         self.has_nonfinite = not np.isfinite(vertices).all()
         self.codes = codes
         self.vertices = vertices
diff --git a/lib/matplotlib/rcsetup.py b/lib/matplotlib/rcsetup.py
@@ -518,7 +518,7 @@ def __call__(self, s):
     'docstring.hardcopy' : [False, validate_bool],  # set this when you want to generate hardcopy docstring
     'plugins.directory' : ['.matplotlib_plugins', str], # where plugin directory is locate
 
-    'path.simplify' : [False, validate_bool],
+    'path.simplify' : [True, validate_bool],
     'agg.path.chunksize' : [0, validate_int]       # 0 to disable chunking;
                                                    # recommend about 20000 to
                                                    # enable. Experimental.
diff --git a/src/agg_py_path_iterator.h b/src/agg_py_path_iterator.h
@@ -353,7 +353,7 @@ class SimplifyPath
 
             //if the perp vector is less than some number of (squared)
             //pixels in size, then merge the current vector
-            if (perpdNorm2 < 0.25)
+            if (perpdNorm2 < (1.0 / 9.0))
             {
                 //check if the current vector is parallel or
                 //anti-parallel to the orig vector. If it is parallel, test

Original file line number	Diff line number	Diff line change
`@@ -479,7 +479,7 @@ def __call__(self, s):`
`479`	`479`	`'svg.embed_char_paths' : [True, validate_bool], # True to save all characters as paths in the SVG`
`480`	`480`	`'plugins.directory' : ['.matplotlib_plugins', str], # where plugin directory is locate`
`481`	`481`
`482`		`- 'path.simplify' : [False, validate_bool]`
	`482`	`+ 'path.simplify' : [True, validate_bool]`
`483`	`483`	`}`
`484`	`484`
`485`	`485`	`if __name__ == '__main__':`
Original file line number	Diff line number	Diff line change
`@@ -353,7 +353,7 @@ class SimplifyPath`
`353`	`353`
`354`	`354`	`//if the perp vector is less than some number of (squared)`
`355`	`355`	`//pixels in size, then merge the current vector`
`356`		`- if (perpdNorm2 < 0.25)`
	`356`	`+ if (perpdNorm2 < (1.0 / 9.0))`
`357`	`357`	`{`
`358`	`358`	`//check if the current vector is parallel or`
`359`	`359`	`//anti-parallel to the orig vector. If it is parallel, test`