Commit Graph

215 Commits

Author SHA1 Message Date
cgohlke 81805a530b Skip viewer tests if no Qt API is available 2014-03-10 23:10:13 -07: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 c70040c236 Add a shape property that gracefully accomodates a new image size 2014-02-08 22:12:38 -06:00
blink1073 85537e3f85 Update the paint tool shape with the viewer image changes 2014-02-08 22:12:01 -06:00
blink1073 df4746d4f9 Update test to use floating point images and with updated values 2014-02-08 12:24:32 -06:00
blink1073 864a189721 Use division consistently between PY2 and PY3 2014-02-08 12:24:06 -06:00
blink1073 8a261242c1 Update test now that aliasing has been removed 2014-02-04 22:04:37 -06:00
blink1073 c2fd471c55 Fix aliasing and update docstring 2014-02-04 21:59:39 -06:00
blink1073 07f64b443a Add test for LineProfiler tool 2014-02-02 22:22:04 -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 3b1182cc2f Skip show commands for doc tests 2013-11-12 08:30:12 +01:00
Johannes Schönberger fb1c1d39f0 Fix misspelled sections 2013-11-09 23:01:58 +01:00
Johannes Schönberger 8b74ab496b Fix python 3 syntax error 2013-11-03 20:03:18 +01:00
Johannes Schönberger a4720212bb Merge pull request #801 from stefanv/six_external
Make six an external dependency.
2013-11-01 00:00:30 -07: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
Juan Nunez-Iglesias e45aee3369 Modify mpl_image_to_rgba to allow RGB input image
mpl_image_to_rgba produces a image of shape (M, N, 3, 4) when the input
image is already RGB. This is understandably confusing for downstream
processes, and this commit fixes it.
2013-10-28 18:29:46 +11:00
Stefan van der Walt eb6867cfe2 Make six an external dependency. 2013-10-27 14:06:26 +02:00
François Boulogne 2e2a82ab30 MAINT: matplotlib is in requierements.txt 2013-10-02 18:14:20 +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
Tony S Yu 6cef8727a0 Minor fixes
- Use absolute imports so __main__ examples work
- PEP8: 2 blank lines
2013-06-29 10:56:03 -05:00
Stefan van der Walt f0506f1293 Fix imports under Python 3. 2013-06-29 10:17:42 -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 c826935d9e Change default Slider update_on value to 'release'
Image filtering is usually slow, so updating on move was usually a bad idea.
2013-06-26 11:23:12 -05: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
Tony S Yu cae693cb69 Change QApp default to previous behavior. 2013-06-25 23:24:06 -05:00
Tony S Yu dae0156230 Make histogram threshold adjustable 2013-06-25 23:20:12 -05:00