Skip to content

Fix IPython NB embed with custom width & height #146

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

Merged
merged 6 commits into from
Nov 17, 2014
Merged

Fix IPython NB embed with custom width & height #146

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
080ee0e
sub in new embed signature in get_embed()
etpinard Nov 14, 2014
36469d3
put s= in try (no need to compute it for except)
etpinard Nov 14, 2014
496b8be
send width and height arg to PlotlyDisplay
etpinard Nov 14, 2014
73d9b66
overwrite IPython _repr_html using get_embed output
etpinard Nov 14, 2014
7c68c29
Merge branch 'master' into embed-width-height
chriddyp Nov 16, 2014
346df62
bump version (fix embed dimensions)
chriddyp Nov 16, 2014
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
16 changes: 10 additions & 6 deletions plotly/tools.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -248,7 +248,8 @@ def get_embed(file_owner_or_url, file_id=None, width="100%", height=525):
s = ("<iframe id=\"igraph\" scrolling=\"no\" style=\"border:none;\""
"seamless=\"seamless\" "
"src=\"{plotly_rest_url}/"
"~{file_owner}/{file_id}/{plot_width}/{plot_height}\" "
"~{file_owner}/{file_id}.embed"
"?width={plot_width}&height={plot_height}\" "
"height=\"{iframe_height}\" width=\"{iframe_width}\">"
"</iframe>").format(
plotly_rest_url=plotly_rest_url,
Expand All @@ -259,7 +260,7 @@ def get_embed(file_owner_or_url, file_id=None, width="100%", height=525):
s = ("<iframe id=\"igraph\" scrolling=\"no\" style=\"border:none;\""
"seamless=\"seamless\" "
"src=\"{plotly_rest_url}/"
"~{file_owner}/{file_id}\" "
"~{file_owner}/{file_id}.embed\" "
"height=\"{iframe_height}\" width=\"{iframe_width}\">"
"</iframe>").format(
plotly_rest_url=plotly_rest_url,
Expand Down Expand Up @@ -291,8 +292,8 @@ def embed(file_owner_or_url, file_id=None, width="100%", height=525):
height (default="525") -- same as width but corresp. to the height of the figure

"""
s = get_embed(file_owner_or_url, file_id, width, height)
try:
s = get_embed(file_owner_or_url, file_id, width, height)
# see if we are in the SageMath Cloud
from sage_salvus import html
return html(s, hide=False)
Expand All @@ -306,7 +307,7 @@ def embed(file_owner_or_url, file_id=None, width="100%", height=525):
fid=file_id)
else:
url = file_owner_or_url
return PlotlyDisplay(url)
return PlotlyDisplay(url, width, height)
else:
warnings.warn(
"Looks like you're not using IPython or Sage to embed this plot. "
Expand Down Expand Up @@ -571,11 +572,14 @@ class PlotlyDisplay(IPython.core.display.HTML):
object can provide alternate representations.

"""
def __init__(self, url):
def __init__(self, url, width, height):
self.resource = url
self.embed_code = get_embed(url)
self.embed_code = get_embed(url, width=width, height=height)
super(PlotlyDisplay, self).__init__(data=self.embed_code)

def _repr_html_(self):
return self.embed_code

def _repr_svg_(self):
url = self.resource + ".svg"
res = requests.get(url)
Expand Down
2 changes: 1 addition & 1 deletion plotly/version.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1 +1 @@
__version__ = '1.4.4'
__version__ = '1.4.5'