Commitbae7631

authored

Merge pull request#29006 from QuLogic/auto-backport-of-pr-28993-on-v3.9.x

Backport PR#28993 on branch v3.9.x (FIX: contourf hatches use multiple edgecolors)

2 parentscbebc61 +7b547ea commitbae7631Copy full SHA for bae7631

File tree

+12

-0

lines changed

+12

-0

lines changed

Lines changed: 4 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -1415,12 +1415,16 @@ def draw(self, renderer):`
`1415`	`1415`	`super().draw(renderer)`
`1416`	`1416`	`return`
`1417`	`1417`	`# In presence of hatching, draw contours one at a time.`
	`1418`	`+edgecolors=self.get_edgecolors()`
	`1419`	`+ifedgecolors.size==0:`
	`1420`	`+edgecolors= ("none",)`
`1418`	`1421`	`foridxinrange(n_paths):`
`1419`	`1422`	`withcbook._setattr_cm(self,_paths=[paths[idx]]),self._cm_set(`
`1420`	`1423`	`hatch=self.hatches[idx%len(self.hatches)],`
`1421`	`1424`	`array=[self.get_array()[idx]],`
`1422`	`1425`	`linewidths=[self.get_linewidths()[idx%len(self.get_linewidths())]],`
`1423`	`1426`	`linestyles=[self.get_linestyles()[idx%len(self.get_linestyles())]],`
	`1427`	`+edgecolors=edgecolors[idx%len(edgecolors)],`
`1424`	`1428`	`):`
`1425`	`1429`	`super().draw(renderer)`
`1426`	`1430`

19.3 KB

Lines changed: 8 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -198,6 +198,14 @@ def test_given_colors_levels_and_extends(split_collections):`
`198`	`198`	`_maybe_split_collections(split_collections)`
`199`	`199`
`200`	`200`
	`201`	`+@image_comparison(['contourf_hatch_colors'],`
	`202`	`+remove_text=True,style='mpl20',extensions=['png'])`
	`203`	`+deftest_hatch_colors():`
	`204`	`+fig,ax=plt.subplots()`
	`205`	`+cf=ax.contourf([[0,1], [1,2]],hatches=['-','/','\\','//'],cmap='gray')`
	`206`	`+cf.set_edgecolors(["blue","grey","yellow","red"])`
	`207`	`+`
	`208`	`+`
`201`	`209`	`@pytest.mark.parametrize("split_collections", [False,True])`
`202`	`210`	`@image_comparison(['contour_log_locator.svg'],style='mpl20',remove_text=False)`
`203`	`211`	`deftest_log_locator_levels(split_collections):`

Comments

(0)