Commit Graph

6585 Commits

Author SHA1 Message Date
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
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
Pratap Vardhan d3f2d11230 DOC: Update bootstrap sphnix links 2014-12-28 16:26:27 +05:30
Steven Silvester f89ab053e1 Merge pull request #1314 from SalvatoreScaramuzzino/RectTool_docs
Rect tool docs
2014-12-27 11:01:08 -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
Steven Silvester 3829401e9f Fix label wrapper function 2014-12-23 21:20:23 -06:00
Steven Silvester 2d3ada19e5 Allow for no exceptions to be raised and cleanup
Allow for no exceptions to be raised

Add some helpful comments

Remove doctest skips

Remove TODO note

Cleanup and skip failing doctest
2014-12-23 16:51:18 -06:00
Steven Silvester c0a0490eed Fix handling of multiple warnings and update tests
Fix handling of multiple warnings

Update all test __init__ files

Update segmentation pkg

Update the color pkg

Update the exposure pkg

Update the filters pkg

Update the io pkg

Update the measure pkg

Update morphology package

Restructure test setup function

Add expected_warnings to __all__

Update restoration pkg.

Remove explicit filter check since it is done elsewhere

Fix the image test helpers

Update the transform pkg

Fix util pkg

Update viewer pkg
2014-12-23 16:51:06 -06:00
Steven Silvester 01ca1d17c8 Add a random seed to the setup 2014-12-23 16:51:04 -06:00
Steven Silvester 1b905d4cef More cleanup and updating of tests
Clean up setup_test and add a teardown_test method

Implement new setup/teardown in novice tests

Fix warning handling in pil_plugin

Update rank tests
2014-12-23 16:50:50 -06:00
Steven Silvester a4e4e57ba5 Create new expected_warnings helper and some cleanup
Add new helper function for expected warnings during test

Indentation cleanups and avoid skipping doctests if possible.
2014-12-23 16:50:18 -06:00
Steven Silvester 782ba46a4c Handle more warnings
Punt on the issue of warnings with the minimum build

Handle warnings in measure pkg

Fix the rank filter test by forcing a random seed in the function

Compare as boolean in imread test

Import loadmat in test_setup to avoid warning

Use a setup method for imread plugin test

Revoke unintended changes

Fix indentation to appease jni

More indentation fixes

Fix unintentional comment out
2014-12-23 16:49:59 -06:00