Commit Graph

134 Commits

Author SHA1 Message Date
Johannes Schönberger ee5c6fbeb2 Use relative imports in skimage files 2015-01-22 07:36:48 -05:00
Steven Silvester 65c1d4eec6 Update viewer for PyQt5 compatibility
Conflicts:
	skimage/viewer/tests/test_plugins.py
	skimage/viewer/tests/test_tools.py
2014-12-27 10:52:27 -06:00
Stefan van der Walt 7f8cd65675 Fix docstring markup errors 2014-12-15 02:21:34 +02:00
Steven Silvester 5877e2ee3d Remove blit background when overlay changes 2014-09-13 07:42:52 -05:00
Tony S Yu 2b98d85cf9 Merge pull request #1065 from blink1073/multi_linetool_drawing
Multi linetool drawing
2014-09-01 21:06:50 -05:00
blink1073 1775e959d6 Switch plugins to use new tool api 2014-09-01 09:59:03 -05:00
Julien Coste 8a337dbe46 Move canny from filter to feature 2014-08-31 10:55:12 +01:00
Steven Silvester 208afc3837 Move version_requirements to _shared and remove skipif from require. 2014-08-02 11:09:46 -05:00
blink1073 b6dcf3c336 Update Travis build to use Anaconda.
Update Travis build to use Anaconda

Travis updates and fixes

More travis fixes

Another travis attempt

Revert changes

Use PIL and Pillow

Refactor travis into 4 different builds

Fix activation error

Remove explicit mpl in build_versions.py

Make matplotlib an explicit requirement

Rearrange travis

Make pillow a hard requirement

Try again to make Pillow optional

Fix bash syntax error

Fix bash syntax error

Bump required cython version

More rearrangments

Remove mpl from build_versions, rearrange travis

Fix version check

Make matplotlib explicit again

Conda install into test env

Check for proper install

Allow tests to skip if networkx is not available

Allow tests to skip if networkx is not available

Try swapping pillow for matplotlib

Allow tests to pass when matplotlib is not present

Remove matplotlib from build_versions

Print PIL version

Get pillow from PIP

Allow tests to skip if matplotlib is not present.

Allow tests to skip if networkx is not present.

travis fix

Remove unused mpl import that caused test error

Use nose-cov and do not run doctests without optional libs

Bump required numpy version and fix nose calls

Make overlay test repeatable

bump numpy version again

Move low-end numpy to python 2.7

Play with minimum versions

Add version requirements and use functions

Add version requirements and use functions

Allow require to skip a test

More implementation of require decorator

Update require decorator and clean up tests

Only use requires decorator when needed

Fix python3 error in version_requirements

Fix build errors

Fix handling of require with tests

More fixes for require handler

Use latest miniconda

Fix more build errors

Fix another dict comprehension and travis file.

Fix missing imports

Fix dictionary again

Fix import warning

Fix last failing test on 2.6

Skip doc examples on python2.6

Do not run doctests on python2.6

Fix typo in travis.yml

Make numpy-1.6 compatibility changes

Use numpy-1.6 in travis python2.6

Add tests for version requirements

Fix line noise in PR

Add additional io plugins

Fix simpleitk test.

Fix python 3 error in freeimage_plugin.

Install imread in Travis.

Put matplotlib settings in XDG recommended directory

Fix formatting in travis yml

Fix formatting in travis yml

Make sure to close PIL file atexit

Fix name of apt package xcftools

Fix pil fp closing

Fix matplotlibrc creation

Only download SimpleITK on py2x, run coverage on py27

Fix travis yml syntax error

Run coveralls on py2.7

Install SimpleITK on py3.3 and run coverage on py3.3

Make simpleitk install quiet

Use standard nose and clean up incantation

Fix travis yml syntax error

Put in miniconda workout for libc error.

Fix imread plugin.

Fix travis syntax

Remove unused import

Remove miniconda libpng in favor of system png

Fix imread install and move libm removal to after optional pkg install.

Fix png header copy in travis yml

Another attempt to use png headers

Debug freeimage

Add jpeg library for freeimage and debug imread.

More debug for imread and freeimage

More freeimage and imread debugging

More debugging

Use correct paths for test env

Make sure imread is tied to libpng15

Add a TODO note for simpleitk test causing error.

Fix typo in yml

Cleanup and add more comments to travis yml

Update comment

Try and add 3.2 support.

Docstring formatting

Add more travis comments.

Try numpy 1.6 on python 2.7

Fix travis syntax error

Rename CONDA to ENV for clarity

Alias python on python 3.2

Use python 3.2 as the system python

Clean up libfreeimage install

Fix order on py3.2 pre_install

Move old numpy back to py26

Use the appropriate python calls.

Debug 3.2 build.

Update comment

Fix syntax error

Another fix for syntax error.

Install scipy after downloading import tools

More debugging for py32

Do not install conda on py3.2 (duh)

Fix typo in travis yml

Fix py32 qt install, separate pyfits and imread to find error

Fix syntax error and front-load option lib check for debug

pyfits is not supported in py3.2, try imread now

imread is also not supported on py3.2

install imread before pyfits to show relationship with libs

Make pip builds quiet

Minor formatting to retrigger build

Allow simpleitk to fail to download without breaking the build

Use travis_retry for SimpleITK

See what breaks when we keep libm in

Now remove libm again
2014-08-02 06:47:09 -05:00
blink1073 1a01f1a83b Fix failing tests 2014-07-16 19:58:13 -05:00
blink1073 9576df45f8 Add tests for all of viewer subpackage, with necessary file mods 2014-07-16 19:38:23 -05:00
Johannes L. Schönberger 82b404a672 Merge pull request #1004 from jni/viewer-examples
Viewer examples
2014-05-08 08:40:26 -04:00
Juan Nunez-Iglesias 17541e2cdc Update plugin class doc example to use output 2014-04-10 12:19:23 +10:00
Juan Nunez-Iglesias 2091dbfe13 Remove deprecated parameter in LineProfile 2014-04-09 23:30:16 +10:00
Johannes Schönberger ece0f30af3 Always Skip doctests which depend on Qt and are in the class doc string
The doc test skip directive modifies the __doc__ attribute, which is not
possible for new-stlye classes.
2014-03-13 18:29:54 -04:00
Tony S Yu 572720df05 Merge pull request #895 from blink1073/fix-canny-py3k
Improve py3k compatibility for Viewer core widget and OverlayPlugin.
2014-02-17 23:58:46 -06:00
blink1073 44dc93d373 Use the more idiomatic list(). 2014-02-17 05:39:33 -06:00
blink1073 3931f18169 Add py3k compatibility for core widget and overlayplugin.
Dictionary keys are treated differently in py3k, causing the Canny
plugin to not work on py3k.
2014-02-16 21:22:44 -06:00
François Boulogne 4f5105983c MAINT: populate __init__.py 2014-02-16 13:15:54 -05:00
Tony S Yu 750911fc98 Merge pull request #881 from blink1073/fix-labelpainter-609
Fix: Viewer: LabelPainter overlay does not update with new loaded image #609
2014-02-12 08:35:28 -06:00
blink1073 85537e3f85 Update the paint tool shape with the viewer image changes 2014-02-08 22:12:01 -06:00
blink1073 864a189721 Use division consistently between PY2 and PY3 2014-02-08 12:24:06 -06:00
blink1073 c2fd471c55 Fix aliasing and update docstring 2014-02-04 21:59:39 -06:00
blink1073 2893fbae0e Refactor perp_lines behavior 2014-02-02 21:52:50 -06:00
blink1073 a1127d4601 Add shaded polygon to lineprofile output 2014-02-02 17:40:52 -06:00
Juan Nunez-Iglesias ec0079dcba Output line drawing and scan data from plugin 2014-01-29 23:27:34 +11:00
Juan Nunez-Iglesias 47f6ddbce0 Update interactive lineprofile tool to new API 2014-01-29 15:06:00 +11:00
Juan Nunez-Iglesias 0fd19e5708 Update lineprofile plugin to use new API 2014-01-26 15:08:51 +11:00
Juan Nunez-Iglesias e24ae38814 Use the new profile_line function from measure
Note that the indices were inverted relative to previous use, which I
believe was incorrect. (See example in docstring, which works, where
it used to be inverted.)
2014-01-26 00:55:52 +11:00
Johannes Schönberger 86c90a336f Merge pull request #821 from JDWarner/add_conditional_doctest_decorator
ENH: Add `doctest_skip_parser` allowing conditional skipping of doctests
2013-11-25 13:54:29 -08:00
JDWarner beb395abbb FIX: Skip viewer.show() commands which hang Travis 2013-11-20 12:29:45 -06:00
Johannes Schönberger f8b5550751 Merge pull request #804 from tonysyu/viewer-color-hist-fix
Fix ColorHistogram to work with Open File
2013-11-20 09:32:00 -08:00
JDWarner d398b43051 ENH: Add doctest_skip_parser allowing conditional skipping of doctests 2013-11-20 11:20:42 -06:00
Tony S Yu 6239ab23b1 Merge pull request #810 from jni/viewer-returns-overlays
WIP: Viewer returns overlays
2013-11-18 18:31:03 -08:00
Juan Nunez-Iglesias 6ff1068baf Add output for color histogram plugin 2013-11-16 16:53:30 +11:00
Johannes Schönberger 8b74ab496b Fix python 3 syntax error 2013-11-03 20:03:18 +01:00
Juan Nunez-Iglesias 4e05ebf711 Incorporate @tonysyu's suggestions re:docstrings 2013-11-01 15:10:30 +11:00
Juan Nunez-Iglesias fae2456b49 Allow OverlayPlugin to return the current overlay 2013-10-31 14:52:01 +11:00
Juan Nunez-Iglesias 7774a76eea Add plugin return values for ImageViewer
The model supported is that plugins can return an overlay, some data,
or both. Each plugin therefore returns an `(overlay, data)` tuple in
which each element can be `None`.

To allow return values, the plugin need only override the `output`
method defined in the base Plugin class.

See discussions here:
https://groups.google.com/d/msg/scikit-image/0nkJM-WguXA/iqogBABa748J
and here:
https://github.com/scikit-image/scikit-image/pull/805
2013-10-31 14:51:06 +11:00
Tony S Yu 5aec00731a Fix ColorHistogram to work with Open File 2013-10-28 22:55:07 -05:00
Stefan van der Walt eb6867cfe2 Make six an external dependency. 2013-10-27 14:06:26 +02:00
Josh Warner (Mac) 6f775400b5 FIX: No longer reset for each update 2013-06-29 15:34:03 -05:00
Josh Warner (Mac) 19a3d33573 FIX: only reset axes when gray <-> rgb, not every update 2013-06-29 15:18:53 -05:00
Josh Warner (Mac) b4e71ecd43 FIX: remove blit, fix 0-length error on grayscale images 2013-06-29 15:09:58 -05:00
Josh Warner (Mac) e790fcc44e FIX: lineprofile no longer flips on left half and cardinals work 2013-06-29 14:24:16 -05:00
Josh Warner (Mac) e20aa7c381 FIX: refactor code, fix linewidth calculation 2013-06-29 14:24:16 -05:00
Josh Warner (Mac) 9ece0b576c FEAT: Automatically switch between RGB / grayscale lineprofile 2013-06-29 14:24:15 -05:00
Stefan van der Walt a1adfa8d54 Correctly check for string type. 2013-06-29 10:17:41 -05:00
Josh Warner 173fec01c7 Merge pull request #575 from tonysyu/feature/viewer-linking
Linked image viewers and docked plugins
2013-06-28 08:32:34 -07:00
tonysyu ed7c75d4c6 Raise ImageViewer to front on start.
Currently only works for main window, does not work for linked viewers.
2013-06-26 11:00:24 -05:00