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.

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

Allows plotting GridSpaces inside Layouts in bokeh #1104

Merged
merged 3 commits into from Feb 6, 2017
Merged

Conversation

@philippjfr
Copy link
Member

@philippjfr philippjfr commented Feb 5, 2017

This PR makes the bokeh GridPlot and LayoutPlot fully composable so you can now plot multiple grids together. Here's two grids and a regular element in a layout:

%%opts Image [height=260]
(hv.GridSpace({(i, j): hv.Curve(range(i+j)) for i in range(1, 3) for j in range(2,4)}) +\
 hv.GridSpace({(i, j): hv.Curve(range(i+j)) for i in range(1, 3) for j in range(2,4)}) +
 hv.Image(np.random.rand(10,10)))

screen shot 2017-02-05 at 11 53 08 pm

The Composing_Data tutorial now also works for both matplotlib and bokeh:

screen shot 2017-02-06 at 2 48 12 am

Related: #381

@philippjfr philippjfr force-pushed the bokeh_grid_layout branch 2 times, most recently from aedd0f0 to 9036a53 Feb 6, 2017
@philippjfr philippjfr added this to the v1.7.0 milestone Feb 6, 2017
@philippjfr
Copy link
Member Author

@philippjfr philippjfr commented Feb 6, 2017

Hmm, the drop in coverage is odd. Will have to look into it.

@philippjfr philippjfr force-pushed the bokeh_grid_layout branch from 9036a53 to 4055716 Feb 6, 2017
@philippjfr philippjfr force-pushed the bokeh_grid_layout branch from 4055716 to dddfe01 Feb 6, 2017
@philippjfr
Copy link
Member Author

@philippjfr philippjfr commented Feb 6, 2017

Now fixed, ready to review/merge.

@jlstevens
Copy link
Contributor

@jlstevens jlstevens commented Feb 6, 2017

Unfortunately there now seem to be merge conflicts. Happy to merge once that is resolved and the tests have passed.

@philippjfr
Copy link
Member Author

@philippjfr philippjfr commented Feb 6, 2017

First time I resolved merge issues directly on GitHub, ready to merge when passing again.

@jlstevens
Copy link
Contributor

@jlstevens jlstevens commented Feb 6, 2017

Looks good and the tests are passing. Merging.

@jlstevens jlstevens merged commit f7c4b9d into master Feb 6, 2017
3 of 4 checks passed
3 of 4 checks passed
@philippjfr
s3-reference-data-cache Test data not cached, see details to rebuild.
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details
continuous-integration/travis-ci/push The Travis CI build passed
Details
coverage/coveralls Coverage increased (+0.02%) to 78.169%
Details
@philippjfr philippjfr deleted the bokeh_grid_layout branch Feb 10, 2017
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Linked issues

Successfully merging this pull request may close these issues.

None yet

2 participants