FazBrowse GitHub Viewer | Trending |
URL:
| Home
Tools: [Download Repo ZIP]   [Original HTTPS Page]

Fixed hatching in PatchCollection class by Impaler343 · Pull Request #27937 · matplotlib/matplotlib · GitHub

  1. matplotlib
  2. matplotlib

Repository navigation

Fixed hatching in PatchCollection class #27937

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

Open
Impaler343 wants to merge 9 commits into
base: main
Choose a base branch
Could not load branches
Branch not found: {{ refName }}

Are you sure you want to change the base?

Some commits from the old base branch may be removed from the timeline, and old review comments may become outdated.
from
Conversation 25 Commits 9 Checks 3 Files changed
Open

Fixed hatching in PatchCollection class #27937

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
eba3d76
Fixed hatching in patches
Impaler343 Mar 19, 2024
a563671
Add support for match_original patch drawing
Impaler343 Apr 17, 2024
254f145
Minor change
Impaler343 Apr 17, 2024
f0375b6
Add match_original to Collections
Impaler343 Apr 17, 2024
85cbdc7
Solve type check problems
Impaler343 Apr 17, 2024
f62a8ea
made hatches into a sequence for PathCollection
r3kste Aug 15, 2024
d8cf3a0
minor fixes
r3kste Aug 15, 2024
e1fe14d
added `hatches` param to other backends
r3kste Aug 16, 2024
a4275a1
minor fix
r3kste Aug 21, 2024
File filter

Filter by extension

Filter by extension .cpp  (1) .h  (1) .py  (6) All 3 file types selected
Viewed files
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Unified
Split
Hide whitespace
Diff view
Unified
Split
Hide whitespace
18 changes: 11 additions & 7 deletions lib/matplotlib/backend_bases.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -205,7 +205,7 @@ def draw_markers(self, gc, marker_path, marker_trans, path,

def draw_path_collection(self, gc, master_transform, paths, all_transforms,
offsets, offset_trans, facecolors, edgecolors,
linewidths, linestyles, antialiaseds, urls,
linewidths, linestyles, antialiaseds, hatches, urls,
offset_position):
"""
Draw a collection of *paths*.
Expand Down Expand Up @@ -236,7 +236,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
gc, list(path_ids), offsets, offset_trans,
facecolors, edgecolors, linewidths, linestyles,
antialiaseds, urls, offset_position):
antialiaseds, hatches, urls, offset_position):
path, transform = path_id
# Only apply another translation if we have an offset, else we
# reuse the initial transform.
Expand All @@ -250,7 +250,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,

def draw_quad_mesh(self, gc, master_transform, meshWidth, meshHeight,
coordinates, offsets, offsetTrans, facecolors,
antialiased, edgecolors):
antialiased, edgecolors, hatches):
"""
Draw a quadmesh.

Expand All @@ -267,7 +267,7 @@ def draw_quad_mesh(self, gc, master_transform, meshWidth, meshHeight,

return self.draw_path_collection(
gc, master_transform, paths, [], offsets, offsetTrans, facecolors,
edgecolors, linewidths, [], [antialiased], [None], 'screen')
edgecolors, linewidths, [], [antialiased], hatches, [None], 'screen')

def draw_gouraud_triangles(self, gc, triangles_array, colors_array,
transform):
Expand Down Expand Up @@ -335,7 +335,7 @@ def _iter_collection_uses_per_path(self, paths, all_transforms,

def _iter_collection(self, gc, path_ids, offsets, offset_trans, facecolors,
edgecolors, linewidths, linestyles,
antialiaseds, urls, offset_position):
antialiaseds, hatches, urls, offset_position):
"""
Helper method (along with `_iter_collection_raw_paths`) to implement
`draw_path_collection` in a memory-efficient manner.
Expand Down Expand Up @@ -365,6 +365,7 @@ def _iter_collection(self, gc, path_ids, offsets, offset_trans, facecolors,
Nedgecolors = len(edgecolors)
Nlinewidths = len(linewidths)
Nlinestyles = len(linestyles)
Nhatches = len(hatches)
Nurls = len(urls)

if (Nfacecolors == 0 and Nedgecolors == 0) or Npaths == 0:
Expand All @@ -385,13 +386,14 @@ def cycle_or_default(seq, default=None):
lws = cycle_or_default(linewidths)
lss = cycle_or_default(linestyles)
aas = cycle_or_default(antialiaseds)
hchs = cycle_or_default(hatches)
urls = cycle_or_default(urls)

if Nedgecolors == 0:
gc0.set_linewidth(0.0)

for pathid, (xo, yo), fc, ec, lw, ls, aa, url in itertools.islice(
zip(pathids, toffsets, fcs, ecs, lws, lss, aas, urls), N):
for pathid, (xo, yo), fc, ec, lw, ls, aa, hch, url in itertools.islice(
zip(pathids, toffsets, fcs, ecs, lws, lss, aas, hchs, urls), N):
if not (np.isfinite(xo) and np.isfinite(yo)):
continue
if Nedgecolors:
Expand All @@ -406,6 +408,8 @@ def cycle_or_default(seq, default=None):
if fc is not None and len(fc) == 4 and fc[3] == 0:
fc = None
gc0.set_antialiased(aa)
if Nhatches:
gc0.set_hatch(hch)
if Nurls:
gc0.set_url(url)
yield xo, yo, pathid, gc0, fc
Expand Down
6 changes: 3 additions & 3 deletions lib/matplotlib/backends/backend_pdf.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -2026,7 +2026,7 @@ def draw_path(self, gc, path, transform, rgbFace=None):

def draw_path_collection(self, gc, master_transform, paths, all_transforms,
offsets, offset_trans, facecolors, edgecolors,
linewidths, linestyles, antialiaseds, urls,
linewidths, linestyles, antialiaseds, hatches, urls,
offset_position):
# We can only reuse the objects if the presence of fill and
# stroke (and the amount of alpha for each) is the same for
Expand Down Expand Up @@ -2068,7 +2068,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
return RendererBase.draw_path_collection(
self, gc, master_transform, paths, all_transforms,
offsets, offset_trans, facecolors, edgecolors,
linewidths, linestyles, antialiaseds, urls,
linewidths, linestyles, antialiaseds, hatches, urls,
offset_position)

padding = np.max(linewidths)
Expand All @@ -2085,7 +2085,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
gc, path_codes, offsets, offset_trans,
facecolors, edgecolors, linewidths, linestyles,
antialiaseds, urls, offset_position):
antialiaseds, hatches, urls, offset_position):

self.check_gc(gc0, rgbFace)
dx, dy = xo - lastx, yo - lasty
Expand Down
6 changes: 3 additions & 3 deletions lib/matplotlib/backends/backend_ps.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -514,7 +514,7 @@ def draw_markers(
@_log_if_debug_on
def draw_path_collection(self, gc, master_transform, paths, all_transforms,
offsets, offset_trans, facecolors, edgecolors,
linewidths, linestyles, antialiaseds, urls,
linewidths, linestyles, antialiaseds, hatches, urls,
offset_position):
# Is the optimization worth it? Rough calculation:
# cost of emitting a path in-line is
Expand All @@ -530,7 +530,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
return RendererBase.draw_path_collection(
self, gc, master_transform, paths, all_transforms,
offsets, offset_trans, facecolors, edgecolors,
linewidths, linestyles, antialiaseds, urls,
linewidths, linestyles, antialiaseds, hatches, urls,
offset_position)

path_codes = []
Expand All @@ -550,7 +550,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
gc, path_codes, offsets, offset_trans,
facecolors, edgecolors, linewidths, linestyles,
antialiaseds, urls, offset_position):
antialiaseds, hatches, urls, offset_position):
ps = f"{xo:g} {yo:g} {path_id}"
self._draw_ps(ps, gc0, rgbFace)

Expand Down
6 changes: 3 additions & 3 deletions lib/matplotlib/backends/backend_svg.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -714,7 +714,7 @@ def draw_markers(

def draw_path_collection(self, gc, master_transform, paths, all_transforms,
offsets, offset_trans, facecolors, edgecolors,
linewidths, linestyles, antialiaseds, urls,
linewidths, linestyles, antialiaseds, hatches, urls,
offset_position):
# Is the optimization worth it? Rough calculation:
# cost of emitting a path in-line is
Expand All @@ -730,7 +730,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
return super().draw_path_collection(
gc, master_transform, paths, all_transforms,
offsets, offset_trans, facecolors, edgecolors,
linewidths, linestyles, antialiaseds, urls,
linewidths, linestyles, antialiaseds, hatches, urls,
offset_position)

writer = self.writer
Expand All @@ -749,7 +749,7 @@ def draw_path_collection(self, gc, master_transform, paths, all_transforms,
for xo, yo, path_id, gc0, rgbFace in self._iter_collection(
gc, path_codes, offsets, offset_trans,
facecolors, edgecolors, linewidths, linestyles,
antialiaseds, urls, offset_position):
antialiaseds, hatches, urls, offset_position):
url = gc0.get_url()
if url is not None:
writer.start('a', attrib={'xlink:href': url})
Expand Down
34 changes: 18 additions & 16 deletions lib/matplotlib/collections.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -360,9 +360,7 @@ def draw(self, renderer):
self._set_gc_clip(gc)
gc.set_snap(self.get_snap())

if self._hatch:
gc.set_hatch(self._hatch)
gc.set_hatch_color(self._hatch_color)
gc.set_hatch_color(self._hatch_color)

if self.get_sketch_params() is not None:
gc.set_sketch_params(*self.get_sketch_params())
Expand All @@ -386,7 +384,7 @@ def draw(self, renderer):
len(self._linewidths) == 1 and
all(ls[1] is None for ls in self._linestyles) and
len(self._antialiaseds) == 1 and len(self._urls) == 1 and
self.get_hatch() is None):
all(h is None for h in self._hatch)):
if len(trans):
combined_transform = transforms.Affine2D(trans[0]) + transform
else:
Expand All @@ -412,6 +410,10 @@ def draw(self, renderer):
gc, paths[0], combined_transform.frozen(),
mpath.Path(offsets), offset_trf, tuple(facecolors[0]))
else:
hatches = self.get_hatch()
if isinstance(renderer, mpl.backends.backend_agg.RendererAgg):
hatches = [mpath.Path.hatch(h) for h in hatches]

if self._gapcolor is not None:
# First draw paths within the gaps.
ipaths, ilinestyles = self._get_inverse_paths_linestyles()
Expand All @@ -420,15 +422,15 @@ def draw(self, renderer):
self.get_transforms(), offsets, offset_trf,
[mcolors.to_rgba("none")], self._gapcolor,
self._linewidths, ilinestyles,
self._antialiaseds, self._urls,
self._antialiaseds, hatches, self._urls,
"screen")

renderer.draw_path_collection(
gc, transform.frozen(), paths,
self.get_transforms(), offsets, offset_trf,
self.get_facecolor(), self.get_edgecolor(),
self._linewidths, self._linestyles,
self._antialiaseds, self._urls,
self._antialiaseds, hatches, self._urls,
"screen") # offset_position, kept for backcompat.

gc.restore()
Expand Down Expand Up @@ -533,7 +535,9 @@ def set_hatch(self, hatch):
hatch : {'/', '\\', '|', '-', '+', 'x', 'o', 'O', '.', '*'}
"""
# Use validate_hatch(list) after deprecation.
mhatch._validate_hatch_pattern(hatch)
hatch = np.atleast_1d(hatch)
for h in hatch:
mhatch._validate_hatch_pattern(h)
self._hatch = hatch
self.stale = True

Expand Down Expand Up @@ -1846,8 +1850,9 @@ def __init__(self, patches, *, match_original=False, **kwargs):
a heterogeneous assortment of different patch types.

match_original : bool, default: False
If True, use the colors and linewidths of the original
patches. If False, new colors may be assigned by
If True, use the colors, linewidths, linestyles
and the hatch of the original patches.
If False, new colors may be assigned by
Comment on lines +1853 to +1855

story645 Aug 15, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

how are new colors assigned if not passed in as part of the original patches?
providing the standard collection arguments, facecolor,
edgecolor, linewidths, norm or cmap.

Expand All @@ -1867,16 +1872,12 @@ def __init__(self, patches, *, match_original=False, **kwargs):
"""

if match_original:
def determine_facecolor(patch):
if patch.get_fill():
return patch.get_facecolor()
return [0, 0, 0, 0]

kwargs['facecolors'] = [determine_facecolor(p) for p in patches]
kwargs['facecolors'] = [p.get_facecolor() for p in patches]
kwargs['edgecolors'] = [p.get_edgecolor() for p in patches]
kwargs['linewidths'] = [p.get_linewidth() for p in patches]
kwargs['linestyles'] = [p.get_linestyle() for p in patches]
kwargs['antialiaseds'] = [p.get_antialiased() for p in patches]
kwargs['hatch'] = [p.get_hatch() for p in patches]

super().__init__(**kwargs)

Expand Down Expand Up @@ -2206,7 +2207,8 @@ def draw(self, renderer):
coordinates, offsets, offset_trf,
# Backends expect flattened rgba arrays (n*m, 4) for fc and ec
self.get_facecolor().reshape((-1, 4)),
self._antialiased, self.get_edgecolors().reshape((-1, 4)))
self._antialiased, self.get_edgecolors().reshape((-1, 4)),
self.get_hatch())
gc.restore()
renderer.close_group(self.__class__.__name__)
self.stale = False
Expand Down
2 changes: 1 addition & 1 deletion lib/matplotlib/hatch.py
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -180,7 +180,7 @@ def __init__(self, hatch, density):


def _validate_hatch_pattern(hatch):
valid_hatch_patterns = set(r'-+|/\xXoO.*')
valid_hatch_patterns = set(r'-+|/\xXoO.*').union({None})

story645 Aug 15, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

why do you need to add None if next line you only validate if not none?

Impaler343 Aug 15, 2024

Copy link
Copy Markdown
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

In the case of a list of Nones, the set function makes it into a singleton set with None. So it fails the

if hatch is not None:

condition

story645 Aug 20, 2024

Copy link
Copy Markdown
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Choose a reason Spam Abuse Off Topic Outdated Duplicate Resolved Low Quality

Ok, but then I think you don't need the if hatch is not None anymore and can just go straight to validation
if hatch is not None:
invalids = set(hatch).difference(valid_hatch_patterns)
if invalids:
Expand Down
25 changes: 19 additions & 6 deletions src/_backend_agg.h
Show comments
View file
Open in desktop
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters. Learn more about bidirectional Unicode characters
Show hidden characters
Original file line number Diff line number Diff line change
Expand Up @@ -173,9 +173,10 @@ class RendererAgg
ColorArray &edgecolors,
LineWidthArray &linewidths,
DashesVector &linestyles,
AntialiasedArray &antialiaseds);
AntialiasedArray &antialiaseds,
PathGenerator &hatch_paths);

template <class CoordinateArray, class OffsetArray, class ColorArray>
template <class CoordinateArray, class OffsetArray, class ColorArray, class PathGenerator>
void draw_quad_mesh(GCAgg &gc,
agg::trans_affine &master_transform,
unsigned int mesh_width,
Expand All @@ -185,7 +186,8 @@ class RendererAgg
agg::trans_affine &offset_trans,
ColorArray &facecolors,
bool antialiased,
ColorArray &edgecolors);
ColorArray &edgecolors,
PathGenerator &hatch_paths);

template <class PointArray, class ColorArray>
void draw_gouraud_triangles(GCAgg &gc,
Expand Down Expand Up @@ -267,6 +269,7 @@ class RendererAgg
LineWidthArray &linewidths,
DashesVector &linestyles,
AntialiasedArray &antialiaseds,
mpl::PathGenerator &hatch_paths,
bool check_snap,
bool has_codes);

Expand Down Expand Up @@ -904,6 +907,7 @@ inline void RendererAgg::_draw_path_collection_generic(GCAgg &gc,
LineWidthArray &linewidths,
DashesVector &linestyles,
AntialiasedArray &antialiaseds,
mpl::PathGenerator &hatch_paths,
bool check_snap,
bool has_codes)
{
Expand All @@ -923,6 +927,7 @@ inline void RendererAgg::_draw_path_collection_generic(GCAgg &gc,
size_t Nedgecolors = safe_first_shape(edgecolors);
size_t Nlinewidths = safe_first_shape(linewidths);
size_t Nlinestyles = std::min(linestyles.size(), N);
size_t Nhatchs = hatch_paths.num_paths();
size_t Naa = safe_first_shape(antialiaseds);

if ((Nfacecolors == 0 && Nedgecolors == 0) || Npaths == 0) {
Expand Down Expand Up @@ -988,6 +993,10 @@ inline void RendererAgg::_draw_path_collection_generic(GCAgg &gc,
}
}

if (Nhatchs) {
gc.hatchpath = hatch_paths(i % Nhatchs);
}

if (check_snap) {
gc.isaa = antialiaseds(i % Naa);

Expand Down Expand Up @@ -1034,7 +1043,8 @@ inline void RendererAgg::draw_path_collection(GCAgg &gc,
ColorArray &edgecolors,
LineWidthArray &linewidths,
DashesVector &linestyles,
AntialiasedArray &antialiaseds)
AntialiasedArray &antialiaseds,
PathGenerator &hatch_paths)
{
_draw_path_collection_generic(gc,
master_transform,
Expand All @@ -1050,6 +1060,7 @@ inline void RendererAgg::draw_path_collection(GCAgg &gc,
linewidths,
linestyles,
antialiaseds,
hatch_paths,
true,
true);
}
Expand Down Expand Up @@ -1127,7 +1138,7 @@ class QuadMeshGenerator
}
};

template <class CoordinateArray, class OffsetArray, class ColorArray>
template <class CoordinateArray, class OffsetArray, class ColorArray, class PathGenerator>
inline void RendererAgg::draw_quad_mesh(GCAgg &gc,
agg::trans_affine &master_transform,
unsigned int mesh_width,
Expand All @@ -1137,7 +1148,8 @@ inline void RendererAgg::draw_quad_mesh(GCAgg &gc,
agg::trans_affine &offset_trans,
ColorArray &facecolors,
bool antialiased,
ColorArray &edgecolors)
ColorArray &edgecolors,
PathGenerator &hatch_paths)
{
QuadMeshGenerator<CoordinateArray> path_generator(mesh_width, mesh_height, coordinates);

Expand All @@ -1160,6 +1172,7 @@ inline void RendererAgg::draw_quad_mesh(GCAgg &gc,
linewidths,
linestyles,
antialiaseds,
hatch_paths,
true, // check_snap
false);
}
Expand Down
Loading
Back | FazBrowse Home | New Git URL