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

Make volume viewer compatible with VTK 5.10 and 6.x #42

Merged
merged 2 commits into from Sep 16, 2015

Conversation

Projects
None yet
3 participants
@dmsurti
Contributor

dmsurti commented Sep 1, 2015

Fixes #41.

This uses the tvtk.common API to ensure the Volume Viewer related VTK pipeline configuration is compatible with VTK 6.x and backwards compatible with 5.10 as well.

@dmsurti dmsurti self-assigned this Sep 1, 2015

@jwiggins

This comment has been minimized.

Member

jwiggins commented Sep 1, 2015

👍 Looks like Travis is a bit unhappy though...

@dmsurti

This comment has been minimized.

Contributor

dmsurti commented Sep 1, 2015

@jwiggins The CTFEditor related tests are failing test_mouse_drag_alpha and test_mouse_drag_color. The tests pass locally on OS X. Are the changes I made in any way related to CTFEditor?

@jwiggins

This comment has been minimized.

Member

jwiggins commented Sep 1, 2015

No. In fact, the tests appear to be failing in the same way as they are in #40

@pberkes

This comment has been minimized.

Contributor

pberkes commented Sep 15, 2015

@dmsurti Can you please try and merge master now? The errors should disappear.

@dmsurti

This comment has been minimized.

Contributor

dmsurti commented Sep 15, 2015

@pberkes Done. Travis is now happy!

@jwiggins

This comment has been minimized.

Member

jwiggins commented Sep 16, 2015

Thanks Deepak!

jwiggins added a commit that referenced this pull request Sep 16, 2015

Merge pull request #42 from dmsurti/vol-viewer-vtk-compat
Make volume viewer compatible with VTK 5.10 and 6.x

@jwiggins jwiggins merged commit 3995bea into enthought:master Sep 16, 2015

1 check passed

continuous-integration/travis-ci/pr The Travis CI build passed
Details

@dmsurti dmsurti deleted the dmsurti:vol-viewer-vtk-compat branch Sep 16, 2015

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment