Commit8699958

authored

Merge pull request#18633 from QuLogic/fix_linestyle_none

Support linestyle='none' in Patch

2 parentsd2cf66d +ea6ca1a commit8699958Copy full SHA for 8699958

File tree

+33

-1

lines changed

+33

-1

lines changed

Lines changed: 7 additions & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,10 @@ def set_linestyle(self, ls):`
`409`	`409`	``'--'`` or ``'dashed'`` dashed line
`410`	`410`	``'-.'`` or ``'dashdot'`` dash-dotted line
`411`	`411`	``':'`` or ``'dotted'`` dotted line
	`412`	+ ``'None'`` draw nothing
	`413`	+ ``'none'`` draw nothing
	`414`	+ ``' '`` draw nothing
	`415`	+ ``''`` draw nothing
`412`	`416`	`=========================== =================`
`413`	`417`
`414`	`418`	`Alternatively a dash tuple of the following form can be provided::`
`@@ -424,6 +428,8 @@ def set_linestyle(self, ls):`
`424`	`428`	`"""`
`425`	`429`	`iflsisNone:`
`426`	`430`	`ls="solid"`
	`431`	`+iflsin [' ','','none']:`
	`432`	`+ls='None'`
`427`	`433`	`self._linestyle=ls`
`428`	`434`	`# get the unscaled dash pattern`
`429`	`435`	`offset,ls=self._us_dashes=mlines._get_dash_pattern(ls)`
`@@ -540,7 +546,7 @@ def _bind_draw_path_function(self, renderer):`
`540`	`546`	`gc.set_foreground(self._edgecolor,isRGBA=True)`
`541`	`547`
`542`	`548`	`lw=self._linewidth`
`543`		`-ifself._edgecolor[3]==0:`
	`549`	`+ifself._edgecolor[3]==0orself._linestyle=='None':`
`544`	`550`	`lw=0`
`545`	`551`	`gc.set_linewidth(lw)`
`546`	`552`	`gc.set_dashes(self._dashoffset,self._dashes)`

Lines changed: 26 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -238,6 +238,32 @@ def test_patch_linestyle_accents():`
`238`	`238`	`fig.canvas.draw()`
`239`	`239`
`240`	`240`
	`241`	`+@check_figures_equal(extensions=['png'])`
	`242`	`+deftest_patch_linestyle_none(fig_test,fig_ref):`
	`243`	`+circle=mpath.Path.unit_circle()`
	`244`	`+`
	`245`	`+ax_test=fig_test.add_subplot()`
	`246`	`+ax_ref=fig_ref.add_subplot()`
	`247`	`+fori,lsinenumerate(['none','None',' ','']):`
	`248`	`+path=mpath.Path(circle.vertices+i,circle.codes)`
	`249`	`+patch=mpatches.PathPatch(path,`
	`250`	`+linewidth=3,linestyle=ls,`
	`251`	`+facecolor=(1,0,0),`
	`252`	`+edgecolor=(0,0,1))`
	`253`	`+ax_test.add_patch(patch)`
	`254`	`+`
	`255`	`+patch=mpatches.PathPatch(path,`
	`256`	`+linewidth=3,linestyle='-',`
	`257`	`+facecolor=(1,0,0),`
	`258`	`+edgecolor='none')`
	`259`	`+ax_ref.add_patch(patch)`
	`260`	`+`
	`261`	`+ax_test.set_xlim([-1,i+1])`
	`262`	`+ax_test.set_ylim([-1,i+1])`
	`263`	`+ax_ref.set_xlim([-1,i+1])`
	`264`	`+ax_ref.set_ylim([-1,i+1])`
	`265`	`+`
	`266`	`+`
`241`	`267`	`deftest_wedge_movement():`
`242`	`268`	`param_dict= {'center': ((0,0), (1,1),'set_center'),`
`243`	`269`	`'r': (5,8,'set_radius'),`

Comments

(0)