Skip to content

Enables setting hatch linewidth in Patches and Collections, also fixes setting hatch linewidth by rcParams #28048

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
tacaswell merged 16 commits into from
Oct 31, 2024
Merged

Enables setting hatch linewidth in Patches and Collections, also fixes setting hatch linewidth by rcParams #28048

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
16 commits
Select commit Hold shift + click to select a range
e191650
Add hatch linewidth setter in Graphics Context Base
Impaler343 Apr 9, 2024
7faf104
Add linewidth parameter to hatch style in PDF, PS and SVG backends
Impaler343 Apr 9, 2024
e754c82
Add linewidht setter and getter methods to Collections
Impaler343 Apr 9, 2024
9976d31
Deprecation warning for setting linewidths in non-PDF,PS,SVG backends
Impaler343 Apr 9, 2024
30726ab
Add setter and getter methods for hatch linewidth in Patch
Impaler343 Apr 9, 2024
9c385ff
Add test for patches setter and getter
Impaler343 Apr 10, 2024
6938fbe
Add test for collections setter and getter
Impaler343 Apr 10, 2024
05300fe
Moved _set_hatch_linewidth to backend_bases
Impaler343 Apr 11, 2024
21cd38d
Added API change note
Impaler343 May 12, 2024
1a41d77
Made suggested changes
Impaler343 Oct 22, 2024
36d132f
Resolved merge problems
Impaler343 Oct 22, 2024
7d94d86
Rollback unwanted changes
Impaler343 Oct 22, 2024
65b5c32
Minor Fixes
Impaler343 Oct 22, 2024
3cad9a1
Fixed wrong linewidth get
Impaler343 Oct 23, 2024
4eb5b87
Passed linewidth instead of gc while creating hatches
Impaler343 Oct 31, 2024
b67df77
Dropped recurring linewidth parameter
Impaler343 Oct 31, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
Moved _set_hatch_linewidth to backend_bases
  • Loading branch information
@Impaler343
Impaler343 committed Oct 24, 2024
commit 05300fe36eb4b4a1114cc2693276a35bc52b926a
10 changes: 10 additions & 0 deletions lib/matplotlib/backend_bases.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -965,6 +965,16 @@ def set_hatch_linewidth(self, hatch_linewidth):
"""Set the hatch linewidth."""
self._hatch_linewidth = hatch_linewidth

def _set_hatch_linewidth(self, hatch_linewidth):
if hasattr(self, "set_hatch_linewidth"):
self.set_hatch_linewidth(hatch_linewidth)
else:
_api.warn_deprecated(
Comment thread
Impaler343 marked this conversation as resolved.
Outdated
"3.8", message="The current backend does not define "
"GraphicsContextRenderer.set_hatch_linewidth; support for such "
"backends is deprecated since %(since)s and will be removed "
"%(removal)s.")

def get_sketch_params(self):
"""
Return the sketch parameters for the artist.
Expand Down
1 change: 1 addition & 0 deletions lib/matplotlib/backend_bases.pyi
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -167,6 +167,7 @@ class GraphicsContextBase:
def get_hatch_color(self) -> ColorType: ...
def set_hatch_color(self, hatch_color: ColorType) -> None: ...
def get_hatch_linewidth(self) -> float: ...
def set_hatch_linewidth(self, hatch_linewidth: float) -> None: ...
def get_sketch_params(self) -> tuple[float, float, float] | None: ...
def set_sketch_params(
self,
Expand Down
4 changes: 1 addition & 3 deletions lib/matplotlib/collections.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -365,9 +365,7 @@ def draw(self, renderer):
if self._hatch:
gc.set_hatch(self._hatch)
gc.set_hatch_color(self._hatch_color)
print(self._hatch_linewidth)
print(self.get_hatch_linewidth())
mhatch._set_hatch_linewidth(gc, self.get_hatch_linewidth())
gc._set_hatch_linewidth(self._hatch_linewidth)

if self.get_sketch_params() is not None:
gc.set_sketch_params(*self.get_sketch_params())
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/patches.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -614,7 +614,7 @@ def _draw_paths_with_artist_properties(
if self._hatch:
gc.set_hatch(self._hatch)
gc.set_hatch_color(self._hatch_color)
mhatch._set_hatch_linewidth(gc, self.get_hatch_linewidth())
gc._set_hatch_linewidth(self._hatch_linewidth)

if self.get_sketch_params() is not None:
gc.set_sketch_params(*self.get_sketch_params())
Expand Down