Commit Graph

8051 Commits

Author SHA1 Message Date
Johannes Schönberger 2f60de7362 Create function to center and normalize image points 2015-01-21 14:10:09 -05:00
emmanuelle 60d0c81aed Changed type of error returned for image dimension strictly greater than 3. 2015-01-20 22:11:24 +01: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
François Boulogne 310ddf6d62 DOC: fix typo 2015-01-18 21:38:34 -05:00
François Boulogne 8befed20bf DOC: fix typos 2015-01-18 19:55:53 -05:00
Juan Nunez-Iglesias 72125aac07 Add underscore for ReST reference 2015-01-19 09:03:30 +11:00
emmanuelle dd9030d44c Implemented fast algorithm also for 3-D and 2D-RGB images. Changed API so
that there is only one function for fast and classic algorithms.
2015-01-18 22:18:29 +01: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
emmanuelle 8b9a777c79 Bug correction: I had forgotten to add __init__.py 2015-01-11 22:37:42 +01:00
emmanuelle c5e38dc5b1 Renamed module, since tests were breaking because module and function
had the same name.
2015-01-10 19:11:15 +01:00
emmanuelle ecaa959195 Implemented asymmetric distance computation to save speed factor of 2 2015-01-10 16:40:43 +01:00
emmanuelle 1d8e02bf38 Removed normalization of h parameters because float images will be
normalized anyway.
2015-01-10 12:15:26 +01: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
Juan Nunez-Iglesias 097f8eaaa0 Space comment and code in plot directive call 2014-12-31 17:09:36 +11:00
Juan Nunez-Iglesias e4d91d1c9f Give 3D image examples 2014-12-31 17:07:28 +11:00
Juan Nunez-Iglesias f9b5f44faa Clarify boolean masks on color images 2014-12-31 17:07:28 +11:00
Juan Nunez-Iglesias 9c770dbdf2 Prefer row/col to r/c when talking about circles 2014-12-31 17:07:28 +11:00
Juan Nunez-Iglesias ad2b02b865 Label transpose operation for clarity 2014-12-31 17:07:28 +11:00
Juan Nunez-Iglesias 0dd81de567 Add paragraph about data locality 2014-12-31 17:07:28 +11:00
Juan Nunez-Iglesias 4a04a6c90c Fix and add output for timing calls 2014-12-31 17:07:28 +11:00
Juan Nunez-Iglesias 53585641d2 Finish code snippet for timings 2014-12-31 17:07:28 +11:00
Juan Nunez-Iglesias 76103d4b05 Define 'prefetching' for users 2014-12-31 17:07:28 +11:00
Juan Nunez-Iglesias b998405f48 Replace 'level' and 'plane' with 'frame' 2014-12-31 17:07:28 +11:00
Juan Nunez-Iglesias 0b779588b0 Restore NumPy from Numpy, grudgingly 2014-12-31 17:07:28 +11:00