Commit Graph
6642 Commits
Author SHA1 Message Date
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
Steven Silvester 68508576f6 Remove debug raise 2014-12-27 10:52:30 -06:00
Steven Silvester 297ccea8b0 Do not try and guess the mpl backend 2014-12-27 10:52:30 -06:00
Steven Silvester 47065d733c Use a smarter backend selection 2014-12-27 10:52:30 -06: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
Juan Nunez-Iglesias 6f1eb316d2 Merge pull request #1325 from blink1073/remove-label-shim
Remove unnecessary `measure.label` shim
2014-12-27 15:21:59 +11:00
Steven Silvester b7f4f61ae7 Remove unnecessary measure.label shim
Conflicts:
	skimage/measure/_label.py
2014-12-26 21:34:33 -06:00
Juan Nunez-Iglesias 7b5dd3b700 Merge pull request #1313 from blink1073/suppress-test-warnings
Handle expected test warnings.
2014-12-27 14:26:59 +11:00
Steven Silvester ecc582193a Try using matplotlib cleanup decorator 2014-12-26 20:55:44 -06:00
Steven Silvester a7a84bbcde Draw the canvas when creating the ax to avoid RuntimeError 2014-12-26 20:14:41 -06:00
Steven Silvester f898bd0209 Style fixes 2014-12-26 11:26:30 -06:00
Juan Nunez-Iglesias 9c2807ac01 Merge pull request #1321 from ahojnnes/hough
Use typed memoryviews in Hough Transform
2014-12-27 00:38:38 +11:00
salvatore ac52af7d83 removed numpy import and spaces 2014-12-26 12:12:15 +01:00
Johannes Schönberger 0c2773b9e4 Use typed memoryviews 2014-12-26 11:08:05 +01:00
salvatore d28ae513ca Travis auto-build Doctest skipped to avoid window opening 2014-12-26 10:37:03 +01:00
Steven Silvester 736f5658bc Fix indent in docstring example 2014-12-25 17:08:36 -06:00
Steven Silvester d760c0adda Fix scipy.sparse.sparsetools warning 2014-12-24 11:20:52 -06:00
Steven Silvester bea57315fb Update docstring and fix pyamg warning check 2014-12-24 09:10:11 -06:00
Steven Silvester 23ae571689 Fix final failing test on Py2.6 build 2014-12-24 08:49:51 -06:00
Steven Silvester 2e0deb9595 Fix syntax error and missing | operator 2014-12-24 07:47:05 -06:00
Steven Silvester d37ccca598 Fix Py2.7 build errors 2014-12-24 06:54:56 -06:00
Steven Silvester 4453120d96 Allow warnings in the minimum build 2014-12-24 06:36:04 -06:00
Steven Silvester 2a6b4ccaea Import scipy.sparse in setup_test 2014-12-24 06:34:13 -06:00
Steven Silvester cb2745cfdf Change default neighbors to None 2014-12-24 05:57:37 -06:00