Now the code produces the same result as the PDF backend for the affine transform demo in its current version, which does not include the skewing test any more.

Re-added the skewing test to the demo and two more transformations. Images and dashed rectangle targets match up nicely for all transforms both in the PDF and PGF backend. Ready to merge from my side.

Shouldn't aplt.show be added at the end of thedemo_affine_image.py?

Actually, I rather prefer your example to what I wrote in#6673 :). Small remark: it seems that you could remove l. 33x3, y3 = x2, y1 as it doesn't seem to be used anywhere (to be honest,@QuLogic did the same remark about my PR).

Besides, it looks like the weird offset between the image and extent rectangle (see#6673) is still present when I plot the new version of the example:

(NB: I change the color of the extent rectangle to red)
And this is even worse when exporting to PDF:demo_affine_PR6792.pdf

@tacaswell Should I open a dedicated issue for the latter odd behavior, as it tends to deviate from the original PR?

Shouldn't aplt.show be added at the end of thedemo_affine_image.py?

I don't know, it was removed by@mdboom in1384c7c. You tell me :)

Small remark: it seems that you could remove l. 33 x3, y3 = x2, y1 as it doesn't seem to be used anywhere

Oh, didn't notice. Will amend my commit.

Besides, it looks like the weird offset between the image and extent rectangle (see#6673) is still present when I plot the new version of the example

That's because the rectangle lines are centered on the left and bottom pixel boundaries rather than the pixel centers. This is consistent within matplotlib. The way the image extents are currently chosen ([-2, 4, -3, 2]), it's a hassle to offset the rectangle by half a pixel, but we could do so.
/edit: Hmm, no, the offset is less than half a pixel of that image. Sorry, that was a red herring.

(NB: I change the color of the extent rectangle to red)

I think red doesn't look nice with the new default colormap, that's why I changed it from blue (the new default color for the plot) to yellow. I'd be fine either way.

Oh, didn't notice. Will amend my commit.

Amended my comment to remove the unusedx3, y3 declaration and re-add theplt.show() at the end.

@f0k Thank you for amending the example! I will then close my redundant PR#6673.

About the red color: I only used it for me. I agree that blue was a bit difficult to see, and if you prefer to replace it with yellow, it's fine for me.

About the offset between the extent rectangle and the image, if it's normal behavior, then everything is alright (I was just scared it might be a small bug), and indeed it's unclear to me that it's really worth the hassle to offset the rectangle by half pixel.

For the PGF backend part, I apologize but I don't know enough about backends to review it.

About the offset between the extent rectangle and the image, if it's normal behavior, then everything is alright (I was just scared it might be a small bug)

I retracted this, I'm not sure it should be this way, but I guess the problem lies outside the demo code. It's not the business of our PRs then.

I will then close my redundant PR#6673.

I liked the outline showing the rotation, we could think about adding this here as well (does it make sense for the other transformations?). But probably this should still be a separate PR -- I extended the demo merely to check whether the modified PGF backend works correctly, not to make the demo more instructive.

For the PGF backend part, I apologize but I don't know enough about backends to review it.

Let's try to summon@pwuertz for this! (He's the original author of the PGF backend, not sure how much he's still involved in matplotlib.)

Ok, reviewed the changes to the PGF backend.

One small detail (just an opinion, feel free to ignore it if you don't agree):
Although merging the (x, y) base translation into the transformation matrix is obviously the cleverest thing to do I'd vote for not doing it. The (x=0, y=0) coordinates must still be written to the pgf command, there is no computational gain from modifying them, just more code in the transform != None path. Also it might be easier to debug the pgf output later if you can tell apart the (x, y) and transform parameters the way they appear within matplitlib too.
I'd just remove lines 647--650 for general simplification.

My main concern before was the half-pixel/pixel alignment, but if your extended demo indeed shows that this is a matplotlib-wide issue and not a backend-to-backend inconsistency it shouldn't hold up a merge of this PR. Better alignment is a job for another day then.

In conclusion: Nice work! Thanks for tracking down the details for making this possible.

Although merging the (x, y) base translation into the transformation matrix is obviously the cleverest thing to do I'd vote for not doing it.

This was not done for cleverness. If we remove lines 647--650, the translation is applied before the affine transform. This was correct for matplotlib 1.5, but is wrong for matplotlib 2.0. Integrating it in the transformation seemed easier than moving the\pgftext one level out (as I was unsure whether this would mess up anything). Should we try that?

My main concern before was the half-pixel/pixel alignment, but if your extended demo indeed shows that this is a matplotlib-wide issue and not a backend-to-backend inconsistency it shouldn't hold up a merge of this PR.

It's definitely consistent between backends.

@pwuertz: Moved\pgftext to the outside so the translation is applied after the affine transform (and not merged into it any longer). Also removed\makeatletter and\makeatother since there's a\makeatletter in the beginning of the PGF output. And finally, I slightly changed the code such that the image is output with height and width of 1.0 inches instead of 1.0/dpi inches, and the affine transform is adapted accordingly. Seems nicer to me.

I can merge this into the second commit before merging if needed, I just separated it for now so@pwuertz can have a look.

Ok, the code looks really good now.

Unfortunately the new image handling is causing trouble on my machine. When I save the demo figure to PDF using the modified backend_pgf the images are missing completely (Xelatex from Ubuntu 16.04 Texlive).

How did you set up your tests so far? Pdf, xe, lualatex? Version? Os? Tex distribution?

When I save the demo figure to PDF using the modified backend_pgf the images are missing completely

Booh. Thanks for testing!

How did you set up your tests so far? Pdf, xe, lualatex? Version? Os? Tex distribution?

Ubuntu 14.04, pdflatex (pdfTeX 3.1415926-2.5-1.40.14 (TeX Live 2013/Debian)). I think pdflatex translates the\pgfsys@transformcm directly into acm (concatenate matrix) operator in the PDF output.
If you changereturn True toreturn False in theoption_scale_image() method, does everything still look okay?
If you go back tobe54fae, does anything change?

I'm seeing good results with pdflatex and lualatex, only xelatex fails. Your initial version with the translation merged into the matrix works however. Might be a bug in xelatex, but I guess it's not worth figuring it out and instead use your first approach again.

@f0k A doc PR to write down your hard won (sorry) understanding of how the image handling works would be appreciated!

@f0k This block here is based on your last commit and works with all 3 texsystems.

# reference the image in the pgf picturewriteln(self.fh,r"\begin{pgfscope}")self._print_pgf_clip(gc)f=1./self.dpi# from display coords to inchwriteln(self.fh,r"\pgfsys@transformshift{%fin}{%fin}"% (x*f,y*f))iftransformisnotNone:tr1,tr2,tr3,tr4,tr5,tr6=transform.frozen().to_values()w=h=1./f# scale is already included in the transformwriteln(self.fh,r"\pgfsys@transformcm{%f}{%f}{%f}{%f}{%fin}{%fin}"% (tr1*f,tr2*f,tr3*f,tr4*f,tr5*f,tr6*f))interp=str(transformisNone).lower()# interpolation in PDF readerwriteln(self.fh,r"\pgftext[left,bottom]{\pgfimage[interpolate=%s,width=%fin,height=%fin]{%s}}"% (interp,w*f,h*f,fname_img))writeln(self.fh,r"\end{pgfscope}")

This block here is based on your last commit and works with all 3 texsystems.

Great, thanks for figuring it out! Shall we really use both transformshift and transformcm at the same time, or change to:

# reference the image in the pgf picturewriteln(self.fh,r"\begin{pgfscope}")self._print_pgf_clip(gc)f=1./self.dpi# from display coords to inchiftransformisNone:writeln(self.fh,r"\pgfsys@transformshift{%fin}{%fin}"% (x*f,y*f))w,h=w*f,h*felse:tr1,tr2,tr3,tr4,tr5,tr6=transform.frozen().to_values()writeln(self.fh,r"\pgfsys@transformcm{%f}{%f}{%f}{%f}{%fin}{%fin}"% (tr1*f,tr2*f,tr3*f,tr4*f, (tr5+x)*f, (tr6+y)*f))w=h=1# scale is already included in the transforminterp=str(transformisNone).lower()# interpolation in PDF readerwriteln(self.fh,r"\pgftext[left,bottom]{\pgfimage[interpolate=%s,width=%fin,height=%fin]{%s}}"% (interp,w,h,fname_img))writeln(self.fh,r"\end{pgfscope}")

For one, this will use either transformshift or transformcm, and secondly, it uses the case distinction to set the image height and width directly to1 instead of1./f*f if there is an affine transform.
I don't really see the benefit of separating the affine transform and the translation (neither in the API nor in the output -- the user won't recognize these numbers anyway).

A doc PR to write down your hard won (sorry) understanding of how the image handling works would be appreciated!

My knowledge is still incomplete... the PDF backend has:

defget_image_magnification(self):returnself.image_dpi/72.0

This probably changes the units of the translation and the transform, or maybe just one of them. I can see if I can improve the base class docstrings with what I know, though.

@f0k Agreed

Agreed

Amended the commits to use my latest proposed code (which uses thetransformshift variant you found, thanks a lot).

A doc PR to write down your hard won (sorry) understanding of how the image handling works would be appreciated!

Actually, the docs were not that bad. Part of the problem was that I had started with matplotlib 1.5.2, which had a different API and less documentation.
I added a commit to fix the documentation right here -- let me know if you'd want me to move this to a separate PR.

If you want you can also take down the #TODO note indraw_image since with your work the function is now feature complete.

If you want you can also take down the#TODO note in draw_image since with your work the function is now feature complete.

Did so. Wasn't sure whether theTODO referred to missing documentation of the base class or the PGF backend.

Travis throws an error for Python 3.4, PYTHON_ARGS=-OO now:

FAIL: matplotlib.tests.test_axes.test_hist2d.test----------------------------------------------------------------------Traceback (most recent call last):  File "/home/travis/build/matplotlib/matplotlib/venv/lib/python3.4/site-packages/nose/case.py", line 198, in runTest    self.test(*self.arg)  File "/home/travis/build/matplotlib/matplotlib/lib/matplotlib/testing/decorators.py", line 55, in failer    result = f(*args, **kwargs)  File "/home/travis/build/matplotlib/matplotlib/lib/matplotlib/testing/decorators.py", line 263, in do_test    '(RMS %(rms).3f)'%err)matplotlib.testing.exceptions.ImageComparisonFailure: images not close: /home/travis/build/matplotlib/matplotlib/result_images/test_axes/hist2d_svg.png vs. /home/travis/build/matplotlib/matplotlib/result_images/test_axes/hist2d-expected_svg.png (RMS 0.121)

Is this anything that could possibly have been caused by this PR, specifically by the last commit which changed the docstring and one argument name?Everything passed fine before. Shall we just restart Travis and hope for the best?

@tacaswell,@mdboom, let me know if anything else is needed. The Travis failure seems unrelated.

Looks good aside from my comments above.

Anything left do be done? It's good to merge from my perspective.

Did you address@mdboom's comments? I don't see any updates to api_changes.rst.

Did you address@mdboom's comments?

I commented on the comment:#6792 (comment)
I don't thinkapi_changes.rst needs an update. Let me know if I'm mistaken.

@f0k Thanks for bearing with us while we wordsmith these details.

I've changedall three occurrences ofpixels indraw_image() (including the ones that were there since 2008) tophysical units (dots or pixels), as per#6792 (comment).

physical units is not used anywhere within the matplotlib documentation, but was suggested by@mdboom in#6792 (comment). He also said the backends would either use pixels or points, which I think is wrong: A point is 1/72 of an inch, while the units here are 1/dpi of an inch.
I'm actually not sure if the translation is ever given in pixels, maybe it should always be calleddots, but I'm not in a position to find out.

Thanks for bearing with us while we wordsmith these details.

Thank you. While I appreciate paying attention to details, it's certainly not very motivating to iterate that long on documenting a single method. It would have helped if somebody more familiar with the internals had taken the time to make a well-informed and consistent suggestion for the docstring. Anyway, I'm thankful matplotlib exists, is in active development and accepts contributions!

🎉 I have restarted the one failed tests (looks like one of the transient ones) and will merge as soon as that comes back green.

@f0k Thanks for digging into a subtle corner of the code base. Hopefully we will hear from you again!

backported to v2.x ase7d7a49

Great, thanks for merging! 👍