Commit Graph

3630 Commits

Author SHA1 Message Date
Juan Nunez-Iglesias df2233cc6a Remove old commented-out code 2013-07-03 00:49:36 +02:00
Juan Nunez-Iglesias dab831b72b Bug fix: map returns iterator in Py3k 2013-07-02 20:13:09 +02:00
Juan Nunez-Iglesias 7f1b9ea4c6 Fix automerge bug 2013-07-02 19:42:24 +02:00
Juan Nunez-Iglesias cd197527fb Speed up initialising 'distance' in SLIC 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias 578876eff8 Bug fix: correctly initialize distance in slic 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias a338618967 Remove diagnostic print 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias 524255c0a2 Improve _slic.pyx doc, bug fixes, debug print 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias 6e64515ea9 Fix build errors with memoryviews 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias b1b70631bd Initial attempt at updating SLIC for memoryviews 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias cba821d5e3 Suppress warning of ambiguous array dim in test 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias 8c2011d4f9 Add UTF8 coding declaration to slic_superpixels.py 2013-07-02 13:22:14 +02:00
Juan Nunez-Iglesias 69fb3fb7ba Make means array contiguous for numpy <= 1.6.1 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 55fe6ce2d6 Bug fix: spatial vs image dimension comparison reversed 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 5a43e03061 Bug fix: add z dimension regardless of multichannel 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias f0d586a32f Revert change to is_rgb 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 1c116a9905 Add function to guesstimate number of spatial dimensions 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias e9c5f666ae Use educated guesses for presence of color channels in SLIC 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias e757b9ae06 Rename slic.py to avoid name conflicts 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 99f905bc54 Always convert image to float in [0, 1] 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 441f4029f6 PEP8 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 332ab0449b Improve PEP8 and Python 3 compliance
Thanks to @JDWarner and @ahojnnes for the input.
2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 5c4d0218ce bug fix: 3d test working 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 215439b43c Add 3D slic tests (gray not working yet) 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 57cc86d7c8 Bug fix: remove unnecessary __get__ in test_slic 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias e9aa78b937 Bug fix: don't add singleton dimension to 3D gray images 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 8e4ab32ed9 Bug fixes: concatenation order and shape assignments 2013-07-02 13:22:13 +02:00
Juan Nunez-Iglesias 6dc8e6300b Separate inner loop of SLIC computation 2013-07-02 13:22:12 +02:00
Juan Nunez-Iglesias 30636428db Add more descriptive error message to _prepare_colorarray 2013-07-02 13:22:12 +02:00
Juan Nunez-Iglesias 620210025f Modify SLIC to allow uneven step sizes 2013-07-02 13:22:12 +02:00
Juan Nunez-Iglesias bb8cfea8c6 Add function to calculate regularly-spaced grid in nD 2013-07-02 13:22:12 +02:00
Juan Nunez-Iglesias a2e32cc90c Add initial 3D modifications (not working) 2013-07-02 13:21:17 +02:00
Juan Nunez-Iglesias 0132998ca1 Make more colorconv functions 3D aware 2013-07-02 13:21:17 +02:00
Juan Nunez-Iglesias 19f264bc8b Make color functions used by SLIC 3D-aware 2013-07-02 13:21:16 +02:00
Johannes Schönberger 647aacb316 Merge pull request #625 from JDWarner/random_noise
FEAT: generator to add various types of random noise to images
2013-07-01 15:42:06 -07:00
Johannes Schönberger 6023b3a22f Merge pull request #617 from JDWarner/memview_transform
Use memoryviews in `skimage._shared.transform`
2013-06-30 22:01:15 -07:00
Johannes Schönberger bb6ea70563 Merge pull request #621 from tonysyu/fix/rank-dtype-compatibility
Fix rank dtype compatibility
2013-06-29 23:30:49 -07:00
Josh Warner (Mac) 5f7fc52830 FEAT: generator to add various types of random noise to images 2013-06-29 18:00:26 -05:00
Tony S Yu 63d13a0b69 Merge pull request #618 from mkcor/filter_canny_passingtype
Canny filter: You can pass an image of any dtype!
2013-06-29 15:38:59 -07:00
Marianne Corvellec 75b3fcd4dd Included Tony's edits. 2013-06-29 18:34:41 -04:00
Marianne Corvellec 5b3081ccc6 Always follow the style guide :) 2013-06-29 18:29:55 -04:00
Marianne Corvellec ee7f710e55 Improved style. 2013-06-29 18:11:36 -04:00
Marianne Corvellec 8f40e05aab Fixed relative threshold: you consider 10% and 20% of the max for range of
corresponding dtype.
2013-06-29 18:11:36 -04:00
Marianne Corvellec 94dc84f5b7 Clarified that you can pass images of any type into Canny filter.
If low and high thresholds are not specified by user, default to 10 and 20 %
(respectively) of range of image's dtype.
2013-06-29 18:11:36 -04:00
Tony S Yu fe4470e480 Merge pull request #615 from JDWarner/fix_lineprofile
Fix lineprofile viewer plugin
2013-06-29 14:13:34 -07:00
Josh Warner (Mac) 6f775400b5 FIX: No longer reset for each update 2013-06-29 15:34:03 -05:00
Josh Warner (Mac) 19a3d33573 FIX: only reset axes when gray <-> rgb, not every update 2013-06-29 15:18:53 -05:00
Josh Warner (Mac) b4e71ecd43 FIX: remove blit, fix 0-length error on grayscale images 2013-06-29 15:09:58 -05:00
Josh Warner (Mac) e790fcc44e FIX: lineprofile no longer flips on left half and cardinals work 2013-06-29 14:24:16 -05:00
Josh Warner (Mac) e20aa7c381 FIX: refactor code, fix linewidth calculation 2013-06-29 14:24:16 -05:00
Josh Warner (Mac) 2b5930ad60 DOC: Add viewer example for RGB line profile 2013-06-29 14:24:16 -05:00