Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Added svg inlining (not clean) ==> pull request #25

Open
wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Added svg inlining (not clean) ==> pull request #25

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
337bb99
Added svg inlining (not clean) ==> pull request
Nov 30, 2020
2dfdfa9
Update inline_svg after type checking
Nov 30, 2020
31538f1
Changed string formatting to be compatible with macos
Nov 30, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 15 additions & 5 deletions ipyplot/_html_helpers.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@
import numpy as np
import shortuuid
from numpy import str_
import urllib

from ._img_helpers import _img_to_base64

Expand Down Expand Up @@ -228,14 +229,14 @@ def _display_html(html: str):
display(HTML(_create_html_viewer(html)))
return display(HTML(html))


def _create_img(
image: str or object,
label: str or int,
width: int,
grid_style_uuid: str,
custom_text: str = None,
force_b64: bool = False):
force_b64: bool = False,
inline_svg: bool = True):
"""Helper function to generate HTML code for displaying images along with corresponding texts.

Parameters
Expand All @@ -256,7 +257,10 @@ def _create_img(
Do mind that using b64 conversion vs reading directly from filepath will be slower.
You might need to set this to `True` in environments like Google colab.
Defaults to False.

inline_svg : bool, optional
You can force inlining svg images instead of reading them directly from filepaths with HTML.
Defaults to False.

Returns
-------
str
Expand All @@ -272,8 +276,11 @@ def _create_img(
use_b64 = True
# if image is a string (URL) display its URL
if type(image) is str or type(image) is str_:
inline_svg = inline_svg and image[-4:]==".svg"
if inline_svg:
use_b64 = False
img_html += '<h4 style="font-size: 9px; padding-left: 10px; padding-right: 10px; width: 95%%; word-wrap: break-word; white-space: normal;">%s</h4>' % (image) # NOQA E501
if not force_b64:
if not force_b64 and not inline_svg:
use_b64 = False
img_html += '<img src="%s"/>' % image
elif "http" in image:
Expand All @@ -285,6 +292,10 @@ def _create_img(
if use_b64:
img_html += '<img src="data:image/png;base64,%s"/>' % _img_to_base64(image, width) # NOQA E501

if inline_svg:
url_svg = urllib.parse.quote(open(image,'r').read())
img_html += '<img src="data:image/svg+xml,%s">' % url_svg

html = """
<div class="ipyplot-placeholder-div-%(0)s">
<div id="ipyplot-content-div-%(0)s-%(1)s" class="ipyplot-content-div-%(0)s">
Expand All @@ -301,7 +312,6 @@ def _create_img(
""" % {'0': grid_style_uuid, '1': img_uuid, '2': label, '3': img_html} # NOQA E501
return html


def _create_imgs_grid(
images: Sequence[object],
labels: Sequence[str or int],
Expand Down