Thanks to visit codestin.com
Credit goes to github.com

Skip to content

Commit 72653f2

Browse files
tacaswelltacaswell
committed
Merge pull request #6504 from jenshnielsen/patch-issue-6035-rebase
FIX: dpi dependent arrow heads Conflicts: lib/matplotlib/tests/baseline_images/test_transforms/pre_transform_data.png Keep version form cherry-pick Manually backport part of bd63121 which renamed the test files.
1 parent ff98856 commit 72653f2

16 files changed

Lines changed: 869 additions & 824 deletions

‎lib/matplotlib/patches.py‎

Lines changed: 17 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -4063,7 +4063,7 @@ def __init__(self, posA=None, posB=None,
40634063
def set_dpi_cor(self, dpi_cor):
40644064
"""
40654065
dpi_cor is currently used for linewidth-related things and
4066-
shrink factor. Mutation scale is not affected by this.
4066+
shrink factor. Mutation scale is affected by this.
40674067
"""
40684068

40694069
self._dpi_cor = dpi_cor
@@ -4072,7 +4072,7 @@ def set_dpi_cor(self, dpi_cor):
40724072
def get_dpi_cor(self):
40734073
"""
40744074
dpi_cor is currently used for linewidth-related things and
4075-
shrink factor. Mutation scale is not affected by this.
4075+
shrink factor. Mutation scale is affected by this.
40764076
"""
40774077

40784078
return self._dpi_cor
@@ -4224,15 +4224,16 @@ def get_path_in_displaycoord(self):
42244224
patchB=self.patchB,
42254225
shrinkA=self.shrinkA * dpi_cor,
42264226
shrinkB=self.shrinkB * dpi_cor
4227-
)
4227+
)
42284228
else:
42294229
_path = self.get_transform().transform_path(self._path_original)
42304230

4231-
_path, fillable = self.get_arrowstyle()(_path,
4232-
self.get_mutation_scale(),
4233-
self.get_linewidth() * dpi_cor,
4234-
self.get_mutation_aspect()
4235-
)
4231+
_path, fillable = self.get_arrowstyle()(
4232+
_path,
4233+
self.get_mutation_scale() * dpi_cor,
4234+
self.get_linewidth() * dpi_cor,
4235+
self.get_mutation_aspect()
4236+
)
42364237

42374238
#if not fillable:
42384239
# self._fill = False
@@ -4542,13 +4543,14 @@ def get_path_in_displaycoord(self):
45424543
patchB=self.patchB,
45434544
shrinkA=self.shrinkA * dpi_cor,
45444545
shrinkB=self.shrinkB * dpi_cor
4545-
)
4546-
4547-
_path, fillable = self.get_arrowstyle()(_path,
4548-
self.get_mutation_scale(),
4549-
self.get_linewidth() * dpi_cor,
4550-
self.get_mutation_aspect()
4551-
)
4546+
)
4547+
4548+
_path, fillable = self.get_arrowstyle()(
4549+
_path,
4550+
self.get_mutation_scale() * dpi_cor,
4551+
self.get_linewidth() * dpi_cor,
4552+
self.get_mutation_aspect()
4553+
)
45524554

45534555
return _path, fillable
45544556

‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dpi_cor_100dpi.png‎

5.19 KB
Loading

‎lib/matplotlib/tests/baseline_images/test_arrow_patches/fancyarrow_dpi_cor_200dpi.png‎

11.2 KB
Loading

‎lib/matplotlib/tests/baseline_images/test_axes/polar_axes.png‎

-4 Bytes
Loading

‎lib/matplotlib/tests/baseline_images/test_axes/polar_coords.png‎

-2 Bytes
Loading

‎lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.png‎

734 Bytes
Loading

lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap_test_image.svg renamed to lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap.svg

Lines changed: 799 additions & 799 deletions
Loading

‎lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap_test_image.pdf‎

-20.9 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_colormap_test_image.png‎

-91.4 KB
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_streamplot/streamplot_linewidth_test_image.png‎

712 Bytes
Loading

0 commit comments

Comments
 (0)