Achieve DPI-independent arrow heads in a cleaner way

afvincent · jenshnielsen · commit f0eda1f4147b · 2016-05-30T13:35:46.000+01:00
diff --git a/lib/matplotlib/patches.py b/lib/matplotlib/patches.py
@@ -4056,23 +4056,19 @@ def __init__(self, posA=None, posB=None,
 
         self._mutation_scale = mutation_scale
         self._mutation_aspect = mutation_aspect
-        # Provide a ref. to scale '_mutation_scale' when setting '_dpi_cor'.
-        self._genuine_mutation_scale = mutation_scale
-
+        
         self.set_dpi_cor(dpi_cor)
         #self._draw_in_display_coordinate = True
 
     def set_dpi_cor(self, dpi_cor):
         """
         dpi_cor is currently used for linewidth-related things and
-        shrink factor. Mutation scale *is* affected by this.
+        shrink factor. Mutation scale is not affected by this.
         """
 
         self._dpi_cor = dpi_cor
         self.stale = True
-        # Scale `_mutation_scale` properly with the new DPI (see issue #6035).
-        self._mutation_scale = self._genuine_mutation_scale * dpi_cor
-
+        
     def get_dpi_cor(self):
         """
         dpi_cor is currently used for linewidth-related things and
@@ -4233,10 +4229,10 @@ def get_path_in_displaycoord(self):
             _path = self.get_transform().transform_path(self._path_original)
 
         _path, fillable = self.get_arrowstyle()(_path,
-                                                self.get_mutation_scale(),
-                                                self.get_linewidth() * dpi_cor,
-                                                self.get_mutation_aspect()
-                                               )
+                                        self.get_mutation_scale() * dpi_cor,
+                                        self.get_linewidth() * dpi_cor,
+                                        self.get_mutation_aspect()
+                                        )
 
         #if not fillable:
         #    self._fill = False
@@ -4549,10 +4545,10 @@ def get_path_in_displaycoord(self):
                                           )
 
         _path, fillable = self.get_arrowstyle()(_path,
-                                                self.get_mutation_scale(),
-                                                self.get_linewidth() * dpi_cor,
-                                                self.get_mutation_aspect()
-                                               )
+                                        self.get_mutation_scale() * dpi_cor,
+                                        self.get_linewidth() * dpi_cor,
+                                        self.get_mutation_aspect()
+                                       )
 
         return _path, fillable
 
diff --git a/lib/matplotlib/text.py b/lib/matplotlib/text.py
@@ -2147,7 +2147,6 @@ def _update_position_xytext(self, renderer, xy_pixel):
 
             d = self.arrowprops.copy()
             ms = d.pop("mutation_scale", self.get_size())
-            ms = renderer.points_to_pixels(ms)
             self.arrow_patch.set_mutation_scale(ms)
 
             if "arrowstyle" not in d:
