Commit239e5f0

authored

Merge pull request#6645 from anntzer/drawstyle-index-and-subslice

FIX: containment and subslice optim. for steps.

2 parents4786a0b +e7dd0e3 commit239e5f0Copy full SHA for 239e5f0

File tree

+18

-18

lines changed

+18

-18

lines changed

Lines changed: 7 additions & 3 deletions

Original file line number	Diff line number	Diff line change
`@@ -476,6 +476,8 @@ def contains(self, mouseevent):`
`476`	`476`	`else:`
`477`	`477`	`# If line, return the nearby segment(s)`
`478`	`478`	`ind=segment_hits(mouseevent.x,mouseevent.y,xt,yt,pixels)`
	`479`	`+ifself._drawstyle.startswith("steps"):`
	`480`	`+ind//=2`
`479`	`481`
`480`	`482`	`ind+=self.ind_offset`
`481`	`483`
`@@ -677,7 +679,8 @@ def recache(self, always=False):`
`677`	`679`	`else:`
`678`	`680`	`interpolation_steps=1`
`679`	`681`	`xy=STEP_LOOKUP_MAP[self._drawstyle](*self._xy.T)`
`680`		`-self._path=Path(np.asarray(xy).T,None,interpolation_steps)`
	`682`	`+self._path=Path(np.asarray(xy).T,`
	`683`	`+_interpolation_steps=interpolation_steps)`
`681`	`684`	`self._transformed_path=None`
`682`	`685`	`self._invalidx=False`
`683`	`686`	`self._invalidy=False`
`@@ -690,8 +693,9 @@ def _transform_path(self, subslice=None):`
`690`	`693`	`"""`
`691`	`694`	`# Masked arrays are now handled by the Path class itself`
`692`	`695`	`ifsubsliceisnotNone:`
`693`		`-_steps=self._path._interpolation_steps`
`694`		`-_path=Path(self._xy[subslice, :],_interpolation_steps=_steps)`
	`696`	`+xy=STEP_LOOKUP_MAP[self._drawstyle](*self._xy[subslice, :].T)`
	`697`	`+_path=Path(np.asarray(xy).T,`
	`698`	`+_interpolation_steps=self._path._interpolation_steps)`
`695`	`699`	`else:`
`696`	`700`	`_path=self._path`
`697`	`701`	`self._transformed_path=TransformedPath(_path,self.get_transform())`

10.7 KB

Lines changed: 0 additions & 6 deletions

Original file line number	Diff line number	Diff line change
`@@ -4449,12 +4449,6 @@ def test_ls_ds_conflict():`
`4449`	`4449`	`linestyle='steps-pre:',drawstyle='steps-post')`
`4450`	`4450`
`4451`	`4451`
`4452`		`-@cleanup`
`4453`		`-deftest_ls_ds_conflict():`
`4454`		`-assert_raises(ValueError,plt.plot,range(32),`
`4455`		`-linestyle='steps-pre:',drawstyle='steps-post')`
`4456`		`-`
`4457`		`-`
`4458`	`4452`	`@image_comparison(baseline_images=['date_timezone_x'],extensions=['png'])`
`4459`	`4453`	`deftest_date_timezone_x():`
`4460`	`4454`	`# Tests issue 5575`

Lines changed: 11 additions & 9 deletions

Original file line number	Diff line number	Diff line change
`@@ -118,16 +118,18 @@ def test_valid_linestyles():`
`118`	`118`	`line.set_linestyle('aardvark')`
`119`	`119`
`120`	`120`
`121`		`-@cleanup`
	`121`	`+@image_comparison(baseline_images=['drawstyle_variants'],remove_text=True,`
	`122`	`+extensions=["png"])`
`122`	`123`	`deftest_drawstyle_variants():`
`123`		`-fig=plt.figure()`
`124`		`-ax=fig.add_subplot(1,1,1)`
`125`		`-fordsin ("default","steps-mid","steps-pre","steps-post",`
`126`		`-"steps",None):`
`127`		`-ax.plot(range(10),drawstyle=ds)`
`128`		`-`
`129`		`-fig.canvas.draw()`
`130`		`-assertTrue`
	`124`	`+fig,axs=plt.subplots(6)`
	`125`	`+dss= ["default","steps-mid","steps-pre","steps-post","steps",None]`
	`126`	`+# We want to check that drawstyles are properly handled even for very long`
	`127`	`+# lines (for which the subslice optimization is on); however, we need`
	`128`	`+# to zoom in so that the difference between the drawstyles is actually`
	`129`	`+# visible.`
	`130`	`+forax,dsinzip(axs.flat,dss):`
	`131`	`+ax.plot(range(2000),drawstyle=ds)`
	`132`	`+ax.set(xlim=(0,2),ylim=(0,2))`
`131`	`133`
`132`	`134`
`133`	`135`	`@cleanup`

Comments

(0)