Steven Silvester
b6a1bcdb06
Merge pull request #1324 from ahojnnes/rel-import
...
Use relative imports in skimage files
2015-01-25 15:26:34 -06:00
Josh Warner
8b24d27155
Merge pull request #1355 from kevin-keraudren/peak_local_max-NDarrays-issue1354
...
ENH: Full ndarray support for peak_local_max
2015-01-24 18:17:28 -07:00
kpk09
b06420fe6a
Added Kevin Keraudren to the list of contributors: test and fix in feature.peak_local_max
2015-01-25 01:09:36 +00:00
kpk09
305f5fd225
Using numpy.argwhere makes code easier to read
2015-01-25 00:22:11 +00:00
kpk09
c5ac705123
Fixed bug in feature.peak_local_max: num_peaks should now be usable for ND arrays.
2015-01-25 00:19:12 +00:00
kpk09
22ffc20fc4
Added broken test for feature.peak_local_max when the image is 3D and num_peaks is set. The current code only holds for 2D images.
2015-01-25 00:15:20 +00:00
Juan Nunez-Iglesias
fcac24e194
Merge pull request #1351 from ahojnnes/reg-prop
...
Speedup regionprops
2015-01-23 09:50:11 +11:00
Josh Warner
d853f5ca94
Merge pull request #1344 from sciunto/doc
...
DOC: Fix minor typos in draw docstrings
2015-01-22 14:29:48 -07:00
François Boulogne
6633ca9a71
PEP8
2015-01-22 13:41:49 -05:00
Johannes Schönberger
d3c4c704fe
Speedup regionprops
2015-01-22 07:53:10 -05:00
Johannes Schönberger
52895c2cc4
Fix invalid relative import
2015-01-22 07:39:08 -05:00
Johannes Schönberger
f9d867cbe2
Raise Cython dependency to 0.21
2015-01-22 07:36:48 -05:00
Johannes Schönberger
2d7cebbe5f
Resolve incorrect rebase
2015-01-22 07:36:48 -05:00
Johannes Schönberger
ee5c6fbeb2
Use relative imports in skimage files
2015-01-22 07:36:48 -05:00
Stefan van der Walt
ea95b5419b
Merge pull request #1348 from jjhelmus/fix_unwrap
...
Fix bugs in `unwrap_phase` when image parameter is a masked array
2015-01-22 00:20:24 -08:00
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
Jonathan Helmus
738953b946
image_unwrapped created as ndarray always
...
In unwrap_phase the image_unwrapped variable is created as an
ndarray even when image is a masked array.
2015-01-21 19:37:23 -06: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