adding more checks on when simplification occurs

kbrose · kbrose · commit e76a19ac34c4 · 2017-06-18T15:50:50.000-05:00
diff --git a/lib/matplotlib/lines.py b/lib/matplotlib/lines.py
@@ -790,11 +790,21 @@ def draw(self, renderer):
                     cap = self._dashcapstyle
                     join = self._dashjoinstyle
                 else:
-                    print(tpath.vertices.size)
-                    tpath = affine.inverted().transform_path(affine.transform_path(tpath).cleaned(simplify=True))
-                    print(tpath.vertices.size)
+                    if tpath.should_simplify and affine.has_inverse:
+                        # the path simplification code expects the path
+                        # to be in pixel space, not data space, but the
+                        # renderer downstream expects the path to be
+                        # in data space. The transformation `affine`
+                        # will put the path into pixel space, and
+                        # affine.inverted() will transform it back to
+                        # data space. So, transform using affine, simplify
+                        # the path, and transform using the affine inverted.
+                        tpath = affine.inverted().transform_path(
+                            affine.transform_path(tpath).cleaned(simplify=True)
+                        )
                     cap = self._solidcapstyle
                     join = self._solidjoinstyle
+
                 gc.set_joinstyle(join)
                 gc.set_capstyle(cap)
                 gc.set_snap(self.get_snap())
diff --git a/lib/matplotlib/path.py b/lib/matplotlib/path.py
@@ -206,12 +206,13 @@ def _fast_from_codes_and_verts(cls, verts, codes, internals=None):
         return pth
 
     def _update_values(self):
+        self._simplify_threshold = rcParams['path.simplify_threshold']
         self._should_simplify = (
             rcParams['path.simplify'] and
-            (len(self._vertices) >= 128 and
-             (self._codes is None or np.all(self._codes <= Path.LINETO)))
+            len(self._vertices) >= 128 and
+            (self._codes is None or np.all(self._codes <= Path.LINETO)) and
+            self._simplify_threshold > 0
         )
-        self._simplify_threshold = rcParams['path.simplify_threshold']
         self._has_nonfinite = not np.isfinite(self._vertices).all()
 
     @property
