Commit Graph

360 Commits

Author SHA1 Message Date
Emmanuelle Gouillart d4b3aeeed3 Merge pull request #1846 from arokem/hull-docs
DOC: Small one. The input to this one needs to be 2D.
2015-12-24 10:34:00 +01:00
arokem 9fb5f1333d TST: Test both functions(!). 2015-12-23 15:36:35 -08:00
arokem 436d0e8ca3 TST: Test error handling in convex_hull, convex_hull_object.
Also, a few PEP8 fixes in both module and tests.
2015-12-23 14:57:44 -08:00
arokem 227211fec7 DOC: Small one. The input to this one needs to be 2D. 2015-12-23 14:24:52 -08:00
emmanuelle 0b61b8f46f Removed deprecated label function from morphology module in preparation
for 0.12 release.
2015-12-23 23:24:22 +01:00
Juan Nunez-Iglesias 3b525987f5 Merge pull request #1787 from ahojnnes/rpropsfix
Various fixes and improvements
2015-11-19 15:16:16 +11:00
Johannes Schönberger 9d3a7b4ecd Remove redundant type conversion 2015-11-18 08:58:01 -05:00
Johannes Schönberger a63b746e6c Move import test to top of function and import outside of function 2015-11-17 10:25:05 -05:00
Johannes Schönberger 6e644c4aa6 Remove single author from header, fix typo
Functions in this file are from multiple authors, the original
author is attributed in the contributors section and the Git history.
2015-11-17 10:22:44 -05:00
Johannes Schönberger 1278b02161 Fix circular import between regionprops and convex_hull_image 2015-11-17 10:19:09 -05:00
Olivia Wilson 2045c44d1f Removed trailing whitespace 2015-10-07 11:30:20 +01:00
Olivia Wilson 07775b6b54 Merge branch 'remove_small_holes' of https://github.com/oew1v07/scikit-image into remove_small_holes
Need to merge with work completed elsewhere
2015-10-07 11:00:02 +01:00
Olivia Wilson 815c5c8ee7 Added new line 2015-10-07 10:59:26 +01:00
Olivia 9025c020ae Adjusting spacing of array in doctests 2015-09-25 14:55:13 +01:00
Olivia 5c7c67db12 Made changes to doctests 2015-09-25 14:51:06 +01:00
Olivia Wilson 19fbdfb6fe Adjusted white space for doctests 2015-09-24 11:58:40 +01:00
Olivia Wilson 413ac4a53b Altered doctests to correct spacing 2015-09-23 21:24:11 +01:00
Olivia a3bb9401c2 Moved the comments on labeled arrays to notes section 2015-09-22 17:41:22 +01:00
Olivia 3f735b6482 Changed the test file to use expected warnings.
This is with help from @blink1073
2015-09-22 17:35:32 +01:00
Olivia c7597d6942 Changed function name to _check_dtype_supported 2015-09-17 13:45:01 +01:00
Olivia a5ba186f80 Added new _supported_types function and new line at end 2015-08-31 19:11:43 +01:00
Olivia 9bfbcfcef3 Removed extraneous print statement 2015-08-30 23:15:04 +01:00
Olivia 9ea085fd6f Added new functionality to remove small holes from images.
This is currently working with **kwargs except for inplace
which I cannot get working. It works with arrays of type int
but returns an array of type bool. Possibly in future add
labelling for arrays of type int. A UserWarning is produced
when using arrays of type int which seems to work normally
but the test created for this does not pick up the warning.

Any assistance on these issues would be helpful. I started
this at EuroScipy 2015 and this fixes issue #1642
2015-08-30 23:05:15 +01:00
Stefan van der Walt 83d5ff9001 Consistently use relative imports 2015-07-11 15:41:37 -05:00
Christian Sachs 639a046611 fixed intra docstring reference links 2015-06-30 16:33:03 +02:00
Christian Sachs 2de03d018a reordered code according to PEP8, modified docstring 2015-06-30 15:07:04 +02:00
Christian Sachs f54c254421 fixed docstrings, renamed variables for clarity, removed old skeletonize function body 2015-06-30 09:39:25 +02:00
Christian Sachs 5301a9a8e3 added faster, Cython based skeletonize function 2015-06-29 22:11:22 +02:00
Juan Nunez-Iglesias 0d134987f9 Harmonize all ndimage usage across the library
Only two forms remain in use:

- `from scipy import ndimage as ndi`
- `from scipy.ndimage import function`
2015-06-09 15:18:37 +10:00
Lee Kamentsky 54f8265603 Issue #803 order the structuring element by distance to get diagonals processed last 2015-05-28 13:28:21 -04:00
kpk09 a9bdaaf274 proposed fix and test for broken watershed on flat areas (https://github.com/scikit-image/scikit-image/issues/803) 2015-05-28 13:28:16 -04:00
Steven Silvester ed7aecdc4c Fix links 2015-02-07 19:33:30 -06:00
Johannes Schönberger ee5c6fbeb2 Use relative imports in skimage files 2015-01-22 07:36:48 -05:00
Juan Nunez-Iglesias 1439341461 Remove unused cmorph extension
The C morphology module has been superseded by wrapping scipy.ndimage.
2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 658a83d46c Don't use backticks to refer to functions
See the "See Also" section in the NumPy Docstring Conventions
document:

https://github.com/numpy/numpy/blob/master/doc/HOWTO_DOCUMENT.rst.txt
2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 2d0a3eff33 Expand explanation of _invert_selem 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 7935e51596 Clarify and fix docstrings 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias d8555142da Update binary morphology tests, which no longer warn 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias f321fefb8b Fix morpho open/close edge bugs by padding image 2015-01-22 11:38:35 +11:00
Juan Nunez-Iglesias 97770e9fa5 Minor update to binary morphology docstrings 2015-01-22 11:29:09 +11:00
Juan Nunez-Iglesias 04536cc7df Update morphology dtypes tests
Previously, we were testing that any dtype would get converted to uint8
and then correctly processed. Now, since we are using ndimage, we are
directly processing all dtypes. I've updated the tests accordingly.
2015-01-22 11:29:08 +11:00
Juan Nunez-Iglesias 1fa6904c04 Workaround for strange ndimage selem inversion 2015-01-22 11:29:08 +11:00
Juan Nunez-Iglesias 8ffed5e424 Wrap scipy.ndimage binary morphology functions 2015-01-22 11:29:08 +11:00
Juan Nunez-Iglesias 56764f8209 Wrap scipy.ndimage grey morphology functions 2015-01-22 11:29:08 +11:00
Steven Silvester f898bd0209 Style fixes 2014-12-26 11:26:30 -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 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 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