-
Notifications
You must be signed in to change notification settings - Fork 532
[ENH] Refactor VTK and tvtk -based interfaces #973
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
Merged
Merged
Changes from all commits
Commits
Show all changes
80 commits
Select commit
Hold shift + click to select a range
420fa76
Added ets.toolkit configuration to initialization
oesteban 559e698
remove ets.toolkit config in mesh (#972)
oesteban 1f9372f
Merge branch 'master' into enh/ETSConfigTookit
oesteban 545f8c5
Merge branch 'master' into enh/ETSConfigTookit
oesteban 1231a5e
add new import under traits as failback for enthougth
oesteban dda44ba
Merge branch 'master' into enh/ETSConfigTookit
oesteban a72fd34
remove error, add config to docs
oesteban d53ab22
setting ETS_TOOLKIT
oesteban 485c44d
insert here new TVTKBaseInterface
oesteban bfb0002
Merge branch 'fix/TVTKPolyDataWriter' into enh/ETSConfigTookit
oesteban 21b86ac
ETS_TOOLKIT settings in algorithms.mesh
oesteban e144fd2
Merge branch 'fix/TVTKPolyDataWriter' into enh/ETSConfigTookit
oesteban 90f27bd
search all tvtk imports and fix ETS_TOOLKIT
oesteban f8f2bed
Merge branch 'master' into enh/ETSConfigTookit
oesteban f79aaad
Merge branch 'master' into enh/ETSConfigTookit
oesteban 6416e5b
add autotest file for TVTKBaseInterface
oesteban befd2db
Merge branch 'master' into enh/ETSConfigTookit
oesteban a0f4a7e
Merge branch 'master' into enh/ETSConfigTookit
oesteban c6bb4e3
removed NotImplementedError in method with implementation
oesteban fa93796
Merge branch 'master' into enh/ETSConfigTookit
oesteban b757cf8
improved code quality, added comments
oesteban a3bad0a
added dependencies to testing frameworks
oesteban df17a3d
added neurodebian in all travis builds
oesteban b9287f4
added dependency (Pillow) and fixed numpy installation
oesteban 30b0323
fixed numpy installation -> moved from circle to travis
oesteban 9ce6bce
replaced Pillow by PIL
oesteban 4ee2119
added PIL from url
oesteban 2416371
added PIL from url also for circle
oesteban fa6e263
fixed PIL installation
oesteban 02ea69b
added missing etsproxy
oesteban 70036b4
added python-vtk
oesteban a52e3d9
fixed vtk installation in travis
oesteban 9a6728e
fixed mayavi in travis and python-vtk in circle
oesteban db3ac3e
added xvfbwrapper requirement, fixing vtk in ci
oesteban 92d98bc
fixed syntax error in travis file
oesteban ffd1d40
fixed errors, added conditional doctest
oesteban cbea5b0
fixing travis for python 3.0, minor in circle
oesteban db08c4f
updated doctests for the case vtk is not installed (typically python …
oesteban 7c7b719
fixed doctests
oesteban 8938187
removed doctests, added exception testing when vtk is unavailable
oesteban b68c66a
Merge branch 'master' into enh/ETSConfigTookit
oesteban a9c039e
fixed mesh tests
oesteban 6b08b02
added base for two regression tests
oesteban 602dea4
Merge branch 'fix/CircleCI/FslFeeds' into enh/ETSConfigTookit
oesteban 5760a0e
Merge branch 'master' into enh/ETSConfigTookit
oesteban c738be6
Merge branch 'master' into enh/ETSConfigTookit
oesteban a94158b
added xvfbwrapper to requirements, improved vtk handling
oesteban 8baba45
improved VTK version parsing
oesteban 5396852
Merge branch 'master' into enh/ETSConfigTookit
oesteban 9339e5f
encapsulated VTK Info in class
oesteban b7ba47f
use tvtk appropriate tools whenever possible
oesteban 9cafde5
refactored vtk/tvtk use and ETSConfigToolkit
oesteban 774906a
Merge branch 'master' into enh/ETSConfigTookit
oesteban 90ad893
fixed outdated code based on xvfbwrapper
oesteban 0dbe8bb
Merge branch 'master' into enh/ETSConfigTookit
oesteban 1ce6850
fixing lint problems
oesteban 01bd281
fixing output_spec is not callable
oesteban edf906e
revert codacy fixes
oesteban 7e12be8
Merge branch 'master' into enh/ETSConfigTookit
oesteban 69cf3aa
Merge branch 'master' into enh/ETSConfigTookit
oesteban 94eeea2
update travis
a6ec41e
remove empty line before docstring
a17422e
add multiverse for ubuntu
c9968ae
travis set to pin libvtk6-dev from trusty
807708b
fix error in travis
39b84f7
fix error in travis
f809b41
trying to fix travis
76e64cc
add trusty-updates-
bf8192d
still fixing VTK6 installation in travis
5843591
fixed command as sudo
b9e051d
use ubuntu trusty
62a23e2
modify the neurodebian script for travis
664a839
remove ubuntu pinning
4a778c8
remove python-vtk from travis
3cd40e1
Merge branch 'master' into enh/ETSConfigTookit
0087bd9
added disable flag in codacy errors
a2e52ee
revert back travis
618fb23
Merge branch 'master' into enh/ETSConfigTookit
2448821
add disable flag for codacy
3c75d63
Merge branch 'master' into enh/ETSConfigTookit
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
i don't think this is necessary since you should be able to install mayavi and traits also using conda (definitely for python 2), but i've also installed the pieces for python 3.
if conda hasn't released mayavi under python 3, one can install this version:
pip install https://github.com/enthought/mayavi/archive/a811639986fc1babecea68656f301c9a68d1ec07.zip
(it works with VTK 6, which is released for both python 2 and 3).
i think that will significantly simplify this file.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Great, I didn't know. I'll be more than happy to add tests to python 3 and simplify this file. Will update soon, thanks!