beb395abbb
FIX: Skip viewer.show() commands which hang Travis
2013-11-20 12:29:45 -06:00
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
d398b43051
ENH: Add doctest_skip_parser allowing conditional skipping of doctests
2013-11-20 11:20:42 -06:00
6239ab23b1
Merge pull request #810 from jni/viewer-returns-overlays
...
WIP: Viewer returns overlays
2013-11-18 18:31:03 -08:00
6ff1068baf
Add output for color histogram plugin
2013-11-16 16:53:30 +11:00
3b1182cc2f
Skip show commands for doc tests
2013-11-12 08:30:12 +01:00
fb1c1d39f0
Fix misspelled sections
2013-11-09 23:01:58 +01:00
8b74ab496b
Fix python 3 syntax error
2013-11-03 20:03:18 +01:00
a4720212bb
Merge pull request #801 from stefanv/six_external
...
Make six an external dependency.
2013-11-01 00:00:30 -07:00
4e05ebf711
Incorporate @tonysyu's suggestions re:docstrings
2013-11-01 15:10:30 +11:00
fae2456b49
Allow OverlayPlugin to return the current overlay
2013-10-31 14:52:01 +11:00
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
5aec00731a
Fix ColorHistogram to work with Open File
2013-10-28 22:55:07 -05:00
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
eb6867cfe2
Make six an external dependency.
2013-10-27 14:06:26 +02:00
2e2a82ab30
MAINT: matplotlib is in requierements.txt
2013-10-02 18:14:20 +02:00
6f775400b5
FIX: No longer reset for each update
2013-06-29 15:34:03 -05:00
19a3d33573
FIX: only reset axes when gray <-> rgb, not every update
2013-06-29 15:18:53 -05:00
b4e71ecd43
FIX: remove blit, fix 0-length error on grayscale images
2013-06-29 15:09:58 -05:00
e790fcc44e
FIX: lineprofile no longer flips on left half and cardinals work
2013-06-29 14:24:16 -05:00
e20aa7c381
FIX: refactor code, fix linewidth calculation
2013-06-29 14:24:16 -05:00
9ece0b576c
FEAT: Automatically switch between RGB / grayscale lineprofile
2013-06-29 14:24:15 -05:00
6cef8727a0
Minor fixes
...
- Use absolute imports so __main__ examples work
- PEP8: 2 blank lines
2013-06-29 10:56:03 -05:00
f0506f1293
Fix imports under Python 3.
2013-06-29 10:17:42 -05:00
a1adfa8d54
Correctly check for string type.
2013-06-29 10:17:41 -05:00
173fec01c7
Merge pull request #575 from tonysyu/feature/viewer-linking
...
Linked image viewers and docked plugins
2013-06-28 08:32:34 -07:00
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
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
cae693cb69
Change QApp default to previous behavior.
2013-06-25 23:24:06 -05:00
dae0156230
Make histogram threshold adjustable
2013-06-25 23:20:12 -05:00
e305677de5
Fix PyQt4 segfault caused by PySide fix.
...
I guess PySide saves the QApplication internally, while PyQt4 doesn't.
Saving the QApplication as a global prevents it from getting garbage
collected. Saving the QApplication as an instance variable in the
ImageViewer also works, but that might prevent the ImageViewer from getting
garbage collected in an interactive session. (weakref doesn't seem to work here.)
2013-06-25 23:15:42 -05:00
c4299c4637
Fix execution in IPython with qt backend.
...
New QApplication and event-loop implementation stolen shamelessly from
IPython. Strangely, running the viewer at the IPython prompt will
open an orphan Matplotlib figure window, but running a script using
`%run` does not.
Only tested on PySide (not PyQt4).
2013-06-25 14:37:01 -05:00
3926f1873d
use items/values for python2/3 compat
2013-06-20 11:16:23 +02:00
cc249baa6c
fix iteritems for python3 compat
2013-06-13 14:06:23 +02:00
71601a2bde
fix path import viewers
2013-06-13 13:17:57 +02:00
eb9de1d7eb
MIN: use print() instead of print
2013-06-12 21:16:23 +02:00
0a8ff1b364
Fix docstring for CollectionViewer slider.
2013-06-09 05:38:08 -05:00
afd1b1b835
Fix display of overlay plugin when original image is updated
2013-06-08 19:24:50 -05:00
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
2ca77c42be
Fix PySide compatibility for signal defs
2013-06-05 11:22:24 -05:00
484e5693b2
Add attributes to Mock object to fix Travis build
2013-05-31 08:15:26 -05:00
87afe3e175
Accidental deletion
2013-05-31 00:14:25 -05:00
9393eac1b0
Third attempt at getting Travis to build
2013-05-31 00:06:59 -05:00
86c2c1a37c
Second attempt to get Travis to pass
2013-05-30 23:38:26 -05:00
3e3ead7d9e
Add mock pyqtSignal to try to get Travis to build
2013-05-30 23:14:30 -05:00
55386ec785
Add smart window-layout for multi-viewer display
2013-05-30 22:37:36 -05:00
16b6411059
Display title in docked plugins
2013-05-30 22:25:02 -05:00
e373e13f03
Fix sizing of PlotPlugin
2013-05-30 22:21:55 -05:00
07630a93e6
Dock plugins to image viewer.
2013-05-30 22:21:21 -05:00
817c9634e8
Fix setting of QT_API environment variable
2013-05-29 20:36:08 +02:00
JDWarner