handle jpg/jpeg in the qtconsole #1643
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| @@ -69,24 +83,38 @@ def _context_menu_make(self, pos): | |||
| def _handle_pyout(self, msg): | |||
| """ Overridden to handle rich data types, like SVG. | |||
| """ | |||
| def pre_image_append(): | |||
There was a problem hiding this comment.
This function shouldn't be defined anew every time this is called. Just make it a method.
|
What happens to jpegs during export? |
|
jpeg are converted to png at export time. I thought it was overkill to try to keep the original file format, as well as proposing a full jpeg export. ( who likes jpeg for graphs anyway ? ) |
| @@ -65,6 +81,15 @@ def _context_menu_make(self, pos): | |||
| #--------------------------------------------------------------------------- | |||
| # 'BaseFrontendMixin' abstract interface | |||
| #--------------------------------------------------------------------------- | |||
| def _pre_image_append(self, msg, prompt_number): | |||
| """ Append the Out[] prompt and mke the output nicer | |||
|
one last spelling error, and I think it's ready for merge. |
This try to handle both image/jpeg image/jpg mimetype that arrives in the qtconsole, when QImage support It, note that image/jpg should never append, but is still supported. It does not allows the export as html/jpeg. The jpeg will be converted to png at save time.
_pre_image_append as method _jpg_supported as Bool Trait
|
Thanks, as I rebased on master to avoid recursive merge, I squashed the fix in the commit that introduced the docstring :-) |
|
Sure, go for it. |
Carreau
added a commit
that referenced
this pull request
Apr 25, 2012
handle jpg/jpeg in the qtconsole This allows the native display of jpeg image in the qtconsole.
mattvonrocketstein
pushed a commit
to mattvonrocketstein/ipython
that referenced
this pull request
Nov 3, 2014
handle jpg/jpeg in the qtconsole This allows the native display of jpeg image in the qtconsole.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
This add jpg/jpeg display in QtConsole, after png has been tried, of course.