Commit Graph

6649 Commits

Author SHA1 Message Date
Stefan van der Walt d0366d2351 Merge pull request #1310 from jni/morpho-update
Wrap ndimage morphology
2015-01-22 00:06:23 -08:00
Juan Nunez-Iglesias 1847b18fbb Test symmetric selems for rank/morpho comparison
The handling of eccentric selems is different between these two
modules, so the results are not expected to agree. (Why they agreed
before this change is beyond me.)
2015-01-22 18:30:10 +11:00
Juan Nunez-Iglesias ea989e2456 Fix a few typos 2015-01-22 11:38:37 +11: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 9eed552ee7 Replace em-dash with regular dash in comment 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 ac5c0c30a9 Fix incorrect call to mark_boundaries in test 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 9b9730b058 Specify mode for mark_boundary tests 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 6586d1eb3f Test subpixel mark_boundaries 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 307d4b6137 Simplify code for coloring boundaries 2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias 242dbf9b2b Don't outline boundaries by default
mark_boundaries used to draw outlines by default. This was necessary
partly because of the asymmetric way boundaries were being drawn. Now,
boundaries are either thick or drawn around background or drawn with
subpixel precision, so I suggest that outlines are less needed.
2015-01-22 11:38:37 +11:00
Juan Nunez-Iglesias cb2002c367 Allow custom background_label in mark_boundaries 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias 257502c099 Prevent unnecessary array copy for RGB images 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias 28591cc3ee Allow different modes in mark_boundaries 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias a406f8dd2a Make subpixel find_boundary doctest more readable 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias a55e3346f7 Set up correct type for find_boundaries test 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias fb893c277d Add correct subpixel boundary estimation. 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias 9c78fce4cd Remove unused deprecation warning 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias 32a960db0d Fix 'outer' mode of find_boundaries 2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias ff1631c717 Update find_boundaries with new modes 2015-01-22 11:38:36 +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 d538abdb97 Fix order kwarg for some versions of numpy.copy
It seems it isn't always a valid kwarg. This bypasses that problem
by calling `np.array` directly (which is just what `np.copy` does
under the hood anyway).
2015-01-22 11:38:36 +11:00
Juan Nunez-Iglesias b1891dc24e Make find_boundaries symmetric
Fixes #738
2015-01-22 11:38:35 +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 92433b2961 Fix and test 0-end bug in crop 2015-01-22 11:38:35 +11:00
Juan Nunez-Iglesias 893c3be289 Import crop into util package namespace 2015-01-22 11:38:35 +11:00
Juan Nunez-Iglesias c96fdb9338 Fix automatic copy even when copy=False in crop 2015-01-22 11:38:35 +11:00
Juan Nunez-Iglesias d7138f1a51 Fix incorrect crop tests 2015-01-22 11:38:35 +11:00
Juan Nunez-Iglesias eaa2aec3cc Add test functions for crop 2015-01-22 11:38:35 +11:00
Juan Nunez-Iglesias fb7ed1d253 Add crop function, inverse to pad 2015-01-22 11:29:09 +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
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