Commit 0d11d38

committed

Fix origin handling when interpolation is None in SVG backend. Issue matplotlib#925.

1 parent 68e7569 commit 0d11d38Copy full SHA for 0d11d38

File tree

+125

-2

lines changed

+125

-2

lines changed

Lines changed: 8 additions & 2 deletions

Original file line number	Diff line number	Diff line change
`@@ -794,11 +794,17 @@ def draw_image(self, gc, x, y, im, dx=None, dy=None, transform=None):`
`794`	`794`	`attrib=attrib)`
`795`	`795`	`else:`
`796`	`796`	`flipped = self._make_flip_transform(transform)`
	`797`	`+ flipped = np.array(flipped.to_values())`
	`798`	`+ y = y+dy`
	`799`	`+ if dy > 0.0:`
	`800`	`+ flipped[3] *= -1.0`
	`801`	`+ y *= -1.0`
`797`	`802`	`attrib[u'transform'] = generate_transform(`
`798`		`- [(u'matrix', flipped.to_values())])`
	`803`	`+ [(u'matrix', flipped)])`
`799`	`804`	`self.writer.element(`
`800`	`805`	`u'image',`
`801`		`- x=unicode(x), y=unicode(y+dy), width=unicode(dx), height=unicode(-dy),`
	`806`	`+ x=unicode(x), y=unicode(y),`
	`807`	`+ width=unicode(dx), height=unicode(abs(dy)),`
`802`	`808`	`attrib=attrib)`
`803`	`809`
`804`	`810`	`if url is not None:`

2.84 KB

Binary file not shown.

4.68 KB

Lines changed: 104 additions & 0 deletions

Lines changed: 13 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -152,6 +152,19 @@ def test_imshow():`
`152`	`152`	`ax.set_xticks([])`
`153`	`153`	`ax.set_yticks([])`
`154`	`154`
	`155`	`+@image_comparison(baseline_images=['no_interpolation_origin'])`
	`156`	`+def test_no_interpolation_origin():`
	`157`	`+ fig = plt.figure()`
	`158`	`+ ax = fig.add_subplot(211)`
	`159`	`+ ax.imshow(np.arange(100).reshape((2, 50)), origin="lower", interpolation='none')`
	`160`	`+ ax.set_xticks([])`
	`161`	`+ ax.set_yticks([])`
	`162`	`+`
	`163`	`+ ax = fig.add_subplot(212)`
	`164`	`+ ax.imshow(np.arange(100).reshape((2, 50)), interpolation='none')`
	`165`	`+ ax.set_xticks([])`
	`166`	`+ ax.set_yticks([])`
	`167`	`+`
`155`	`168`	`if __name__=='__main__':`
`156`	`169`	`import nose`
`157`	`170`	`nose.runmodule(argv=['-s','--with-doctest'], exit=False)`

Comments

(0)