Commit Graph

6615 Commits

Author SHA1 Message Date
Jonathan Helmus de01ea56ae unwrap_phase returns masked array when image is masked
With commit e3b84ed the unwrap_phase function would always return an ndarray
even when image was masked.  This restores the pre-e3b84ed behavior of
returning a masked array when the image is masked.
2015-01-21 16:23:50 -06:00
Jonathan Helmus eef3734bfe Remove end of line whitespace in test_unwrap.py 2015-01-21 16:03:18 -06:00
Jonathan Helmus 8ebe073ad5 BUG: unwrap_phase on compressed masked array
unwrap_phase works on masked arrays with a compressed mask (no elements masked)

Closes #1346
2015-01-21 16:01:13 -06:00
Stefan van der Walt 9b16b35d96 Merge pull request #1318 from blink1073/pyqt5
Update viewer for PyQt5 compatibility
2015-01-21 13:27:40 -08:00
Stefan van der Walt cd700594aa Merge pull request #1339 from jni/slic-doc
Update documentation and behaviour in SLIC
2015-01-18 23:45:48 -08:00
Juan Nunez-Iglesias 72125aac07 Add underscore for ReST reference 2015-01-19 09:03:30 +11:00
Steven Silvester 530ffa94f3 Merge pull request #1341 from JDWarner/cover_pad
ENH: Fully cover `pad` and backports from NumPy 0.10dev
2015-01-16 23:33:39 -06:00
Josh Warner (Mac) aa2215ccfc ENH: Fully cover pad and backports from NumPy 0.10dev 2015-01-16 21:54:02 -07:00
Juan Nunez-Iglesias 62d6a3d7e9 Merge pull request #1340 from blink1073/fix-filter-pkg-shim
Fix Filter Package Shim Implementation
2015-01-16 15:23:45 +11:00
Steven Silvester 6339eff8fe Fix filter package shim implementation 2015-01-15 21:17:40 -06:00
Juan Nunez-Iglesias 879a7b0bb5 Update treatment of convert2lab in slic
It still defaults to `True` but only when the last dimension of the
input array could be construed as RGB.

Also, update ValueError description in docstring.
2015-01-16 13:11:25 +11:00
Juan Nunez-Iglesias c102a0bf0e Add reference to SLIC0 in SLIC docstring 2015-01-16 12:08:13 +11:00
Stefan van der Walt ecfdc9118a Merge pull request #1338 from blink1073/imshow-fixes
Update Matplotlib plugin docstring.  Create test module setup function.
2015-01-15 17:01:09 -08:00
Steven Silvester 87998d6518 Update docstring and create test module setup function 2015-01-15 18:57:18 -06:00
Steven Silvester c3ccb60bda Merge pull request #1300 from jni/io-imshow-data
WIP: overhaul matplotlib imshow plugin for new data policy
2015-01-15 18:39:05 -06:00
Juan Nunez-Iglesias 61d9812cd8 Don't create superfluous ip variable 2015-01-15 23:31:51 +11:00
Juan Nunez-Iglesias 5d115209b5 Create new figure for each imshow test 2015-01-15 23:07:09 +11:00
Juan Nunez-Iglesias 7b2dbcb15b Expand the docstring for imshow 2015-01-15 22:39:50 +11:00
Juan Nunez-Iglesias c6dff6942d Don't create new plot automatically
This behavior is a bit too magical and may interfere with creation of
interactive ImageCollection browsers, for example.
2015-01-15 22:26:55 +11:00
Juan Nunez-Iglesias e472009090 Add test for signed images 2015-01-15 22:26:17 +11:00
Juan Nunez-Iglesias 2bdd239496 Overhaul imshow to clarify flow 2015-01-15 22:25:41 +11:00
Juan Nunez-Iglesias 30c522e706 Use different colormaps depending on input image 2015-01-15 20:16:24 +11:00
Juan Nunez-Iglesias 400c3fd202 Rename ax to ax_im in mpl imshow plugin 2015-01-15 15:44:55 +11:00
Juan Nunez-Iglesias 9fe4f33793 Add tests for nonstandard images 2015-01-14 20:29:15 +11:00
Juan Nunez-Iglesias 176889933f Add tests for io.imshow mpl plugin 2015-01-14 20:13:32 +11:00
Juan Nunez-Iglesias 984e22b47a Replace Axes with AxesImage where relevant 2015-01-14 20:13:32 +11:00
Juan Nunez-Iglesias fab4ff2305 Fix incorrect call to colorbar 2015-01-14 20:13:32 +11:00
Juan Nunez-Iglesias c68c8e5468 Improve mpl imshow plugin docstring 2015-01-14 20:13:32 +11:00
Juan Nunez-Iglesias fac8fde9dc Overhaul matplotlib imshow plugin
- images are displayed within their native dtype range,
- unless they are outside of their range (e.g. a float image with
  values greater than 1) or they are of an unsupported dtype (e.g.
  a uint64 image), in which case the dynamic range of the display
  corresponds to the image range,
- which is also done for images with extremely low contrast for their
  native range (e.g. float images in [1e-7, 5e-7].

In the latter two cases, a colorbar is also displayed and a warning is
raised.

Finally, we return the axes object on which the image is plotted, to
enable further plotting in the matplotlib new OO style.
2015-01-14 20:13:32 +11:00
Juan Nunez-Iglesias 8f4d0247b5 Add docstring to matplotlib imshow plugin
The image is now named as an argument, and the axes are returned, in
keeping with matplotlib convention.
2015-01-14 20:13:32 +11:00
Stefan van der Walt e030e8c4c6 Merge pull request #1337 from jni/fix-label2rgb
Fix `label2rgb` by adding default background color
2015-01-13 16:08:40 -08:00
Juan Nunez-Iglesias eab2168846 Add test to ensure default bg_color in label2rgb 2015-01-14 10:05:22 +11:00
Juan Nunez-Iglesias 9438b96774 Add default bg_color to label2rgb 2015-01-14 09:59:15 +11:00
Steven Silvester d24ce2b4ab Merge pull request #1328 from pratapvardhan/misc-doc
DOC: Update bootstrap sphnix links
2015-01-01 19:28:23 -06:00
Steven Silvester d714d0bcbc Separate qt version check from has_qt flag 2014-12-30 21:01:23 -06:00
Steven Silvester 7da4d5a19a Merge pull request #2 from flying-sheep/pyqt5
fixed Qt5 compat
2014-12-30 20:57:13 -06:00
Phil Schaf 14a2b5d8f3 fixed Qt5 compat 2014-12-30 17:57:19 +01:00
Pratap Vardhan d3f2d11230 DOC: Update bootstrap sphnix links 2014-12-28 16:26:27 +05:30
Steven Silvester 51ab675d3c Fix lingering merge issue 2014-12-27 11:11:36 -06:00
Steven Silvester f89ab053e1 Merge pull request #1314 from SalvatoreScaramuzzino/RectTool_docs
Rect tool docs
2014-12-27 11:01:08 -06:00
Steven Silvester 67fadc0ed8 Fix mock Qt objects again 2014-12-27 10:54:19 -06:00
Steven Silvester 42b330e562 Add QWidget to the mock Qt 2014-12-27 10:54:19 -06:00
Steven Silvester 8da175d70e Add dummy Qt properties 2014-12-27 10:54:19 -06:00
Steven Silvester c3ade4416f Instantiate QtCore dummy class 2014-12-27 10:54:18 -06:00
Steven Silvester 7474db1f0d Another fix for dummy Signal 2014-12-27 10:54:18 -06:00
Steven Silvester 6d445776c9 Fix the dummy Signal 2014-12-27 10:54:18 -06:00
Steven Silvester 11c6a9f86a Fix another viewer import 2014-12-27 10:54:18 -06:00
Steven Silvester 2eee1faaff Fix import error in viewer.utils.core 2014-12-27 10:54:18 -06:00
Steven Silvester 6f57873526 Do not use ImportError behaviour in viewer
Conflicts:
	skimage/viewer/tests/test_tools.py
2014-12-27 10:54:13 -06:00
Steven Silvester 8d40cbd1d2 Allow viewer package to import without Qt 2014-12-27 10:52:30 -06:00