Commit Graph

120 Commits

Author SHA1 Message Date
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
Tony S Yu dae0156230 Make histogram threshold adjustable 2013-06-25 23:20:12 -05:00
François Boulogne 3926f1873d use items/values for python2/3 compat 2013-06-20 11:16:23 +02:00
François Boulogne cc249baa6c fix iteritems for python3 compat 2013-06-13 14:06:23 +02:00
Tony S Yu afd1b1b835 Fix display of overlay plugin when original image is updated 2013-06-08 19:24:50 -05:00
Tony S Yu cc2f1854b5 Fix plugin interaction with CollectionViewer
* Signal updates to original image when image changed in CollectionViewer.
* Update plugin arguments for the filter.
* Also fixes image updates when opening a new image from the file menu.
2013-06-08 19:06:23 -05:00
tonysyu 2ca77c42be Fix PySide compatibility for signal defs 2013-06-05 11:22:24 -05:00
Tony S Yu 55386ec785 Add smart window-layout for multi-viewer display 2013-05-30 22:37:36 -05:00
Tony S Yu e373e13f03 Fix sizing of PlotPlugin 2013-05-30 22:21:55 -05:00
Tony S Yu 07630a93e6 Dock plugins to image viewer. 2013-05-30 22:21:21 -05:00
Tony S Yu bd860b7720 Add infrastructure for conneting plugin output to a viewer. 2013-05-28 23:52:10 -05:00
Tony S Yu a5d42a3940 Add skimage.viewer.qt wrapper.
This allows the viewer to use either PyQt4 or PySide as the toolkit.
2013-05-17 16:22:17 -05:00
Tony S Yu 230fefa748 ENH: Improve usability of watershed_demo.
* Replace 0 label with 'Erase'
* Use OK button instead of enter key to calculate watershed.
2013-01-24 21:47:42 -06:00
Tony S Yu 9c4eb3a6fc Use print function for python 3 compatibility 2012-12-26 22:21:24 -08:00
Tony S Yu df916713f5 ENH: Add PaintTool and LabelPlugin 2012-12-26 22:03:59 -08:00