Skip to content

Navigation Menu

Sign in
Appearance settings

Search code, repositories, users, issues, pull requests...

Provide feedback

We read every piece of feedback, and take your input very seriously.

Saved searches

Use saved searches to filter your results more quickly
Appearance settings

Commit 112a901

Browse filesBrowse files
QuLogicQuLogic
committed
Make hatch colour an rcParam.
1 parent cb21ba7 commit 112a901
Copy full SHA for 112a901
Expand file treeCollapse file tree

18 files changed

+370
-78
lines changed

‎doc/users/dflt_style_changes.rst

Copy file name to clipboardExpand all lines: doc/users/dflt_style_changes.rst
+9-6Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -597,17 +597,20 @@ To restore the previous behavior explicitly pass the keyword argument
597597
Hatching
598598
========
599599

600-
The width of the lines in a hatch pattern is now configurable by the
601-
rcParam `hatch.linewidth`, with a default of 1 point. The old
602-
behavior was different depending on backend:
600+
The color and width of the lines in a hatch pattern are now configurable by the
601+
rcParams `hatch.color` and `hatch.linewidth`, with defaults of black and 1
602+
point, respectively. The old behaviour for the color was to apply the edge
603+
color or use black, depending on the artist; the old behavior for the line
604+
width was different depending on backend:
603605

604606
- PDF: 0.1 pt
605607
- SVG: 1.0 pt
606608
- PS: 1 px
607609
- Agg: 1 px
608610

609-
The old behavior can not be restored across all backends simultaneously, but
610-
can be restored for a single backend by setting::
611+
The old color behavior can not be restored. The old line width behavior can not
612+
be restored across all backends simultaneously, but can be restored for a
613+
single backend by setting::
611614

612615
mpl.rcParams['hatch.linewidth'] = 0.1 # previous pdf hatch linewidth
613616
mpl.rcParams['hatch.linewidth'] = 1.0 # previous svg hatch linewidth
@@ -620,7 +623,7 @@ The behavior of the PS and Agg backends was DPI dependent, thus::
620623
mpl.rcParams['hatch.linewidth'] = 1.0 / dpi # previous ps and Agg hatch linewidth
621624

622625

623-
There is no API level control of the hatch linewidth.
626+
There is no API level control of the hatch color or linewidth.
624627

625628

626629
.. _default_changes_font:

‎lib/matplotlib/backend_bases.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backend_bases.py
+7Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -796,6 +796,7 @@ def __init__(self):
796796
self._linewidth = 1
797797
self._rgb = (0.0, 0.0, 0.0, 1.0)
798798
self._hatch = None
799+
self._hatch_color = colors.to_rgba(rcParams['hatch.color'])
799800
self._hatch_linewidth = rcParams['hatch.linewidth']
800801
self._url = None
801802
self._gid = None
@@ -1104,6 +1105,12 @@ def get_hatch_path(self, density=6.0):
11041105
return None
11051106
return Path.hatch(self._hatch, density)
11061107

1108+
def get_hatch_color(self):
1109+
"""
1110+
Gets the color to use for hatching.
1111+
"""
1112+
return self._hatch_color
1113+
11071114
def get_hatch_linewidth(self):
11081115
"""
11091116
Gets the linewidth to use for hatching.

‎lib/matplotlib/backends/backend_pdf.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_pdf.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2217,7 +2217,7 @@ def hatch_cmd(self, hatch):
22172217
else:
22182218
return [Name('DeviceRGB'), Op.setcolorspace_nonstroke]
22192219
else:
2220-
hatch_style = (self._rgb, self._fillcolor, hatch)
2220+
hatch_style = (self._hatch_color, self._fillcolor, hatch)
22212221
name = self.file.hatchPattern(hatch_style)
22222222
return [Name('Pattern'), Op.setcolorspace_nonstroke,
22232223
name, Op.setcolor_nonstroke]

‎lib/matplotlib/backends/backend_ps.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_ps.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -897,7 +897,7 @@ def _draw_ps(self, ps, gc, rgbFace, fill=True, stroke=True, command=None):
897897
if hatch:
898898
hatch_name = self.create_hatch(hatch)
899899
write("gsave\n")
900-
write("[/Pattern [/DeviceRGB]] setcolorspace %f %f %f " % gc.get_rgb()[:3])
900+
write("[/Pattern [/DeviceRGB]] setcolorspace %f %f %f " % gc.get_hatch_color()[:3])
901901
write("%s setcolor fill grestore\n" % hatch_name)
902902

903903
if stroke:

‎lib/matplotlib/backends/backend_svg.py

Copy file name to clipboardExpand all lines: lib/matplotlib/backends/backend_svg.py
+1-1Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -349,7 +349,7 @@ def _get_hatch(self, gc, rgbFace):
349349
"""
350350
if rgbFace is not None:
351351
rgbFace = tuple(rgbFace)
352-
edge = gc.get_rgb()
352+
edge = gc.get_hatch_color()
353353
if edge is not None:
354354
edge = tuple(edge)
355355
dictkey = (gc.get_hatch(), rgbFace, edge)

‎lib/matplotlib/mpl-data/stylelib/classic.mplstyle

Copy file name to clipboardExpand all lines: lib/matplotlib/mpl-data/stylelib/classic.mplstyle
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@ patch.force_edgecolor : True
3434
patch.edgecolor : k
3535
patch.antialiased : True # render patches in antialiased (no jaggies)
3636

37+
hatch.color : k
3738
hatch.linewidth : 1.0
3839

3940
hist.bins : 10

‎lib/matplotlib/rcsetup.py

Copy file name to clipboardExpand all lines: lib/matplotlib/rcsetup.py
+1Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -930,6 +930,7 @@ def validate_animation_writer_path(p):
930930
'patch.antialiased': [True, validate_bool], # antialiased (no jaggies)
931931

932932
## hatch props
933+
'hatch.color': ['k', validate_color],
933934
'hatch.linewidth': [1.0, validate_float],
934935

935936
## Histogram properties

‎lib/matplotlib/tests/baseline_images/test_artist/clip_path_clipping.pdf

Copy file name to clipboard
20 Bytes
Binary file not shown.

‎lib/matplotlib/tests/baseline_images/test_artist/clip_path_clipping.png

Copy file name to clipboard
-2.37 KB
Loading

0 commit comments

Comments
0 (0)
Morty Proxy This is a proxified and sanitized view of the page, visit original site.