Commit Graph

139 Commits

Author SHA1 Message Date
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 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 620210025f Modify SLIC to allow uneven step sizes 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
François Boulogne a48de8dea9 add optional + default in pyx docstring 2013-05-29 20:18:19 +02:00
Johannes Schönberger 69eafa95df Add __all__ to segmentation package 2013-04-28 23:20:00 +02:00
Stefan van der Walt 81479ca591 BUG: Fix integer type in Felzenwalb cython. 2013-04-22 17:27:01 +02:00
Josh Warner (Mac) e3c3a69560 add assertion checks to ensure data shape is unchanged 2013-04-14 20:16:18 -05:00
Josh Warner (Mac) 8e0eb4a2b1 fix: remove unnecessary forced copy 2013-04-14 20:15:19 -05:00
Josh Warner (Mac) 28c7d8afd3 Use force_copy argument of img_as_float
Also three PEP8 fixes
2013-04-12 10:02:33 -05:00
Josh Warner (Mac) f1ef7d5da2 PEP8 fixes; remove unneeded pyamg import; add data shape check 2013-04-11 14:02:10 -05:00
Josh Warner (Mac) 1edbf3e6f4 fix to preserve input image shape upon executing random_walker 2013-04-11 11:49:10 -05:00
Christoph Gohlke dda83fdb55 Fix ValueError: Buffer dtype mismatch on win-amd64 2013-03-04 17:30:40 -08:00
Tony S Yu 17e7ba3de7 DOC: Fix Sphinx errors. 2013-03-02 17:22:10 -06:00
Johannes Schönberger 62d83ad42c Globally change np to cnp if cimported 2013-02-24 14:14:14 +01:00
Johannes Schönberger 7e578b5dec Fix index type error in SLIC function 2013-02-22 17:05:39 +01:00
Johannes Schönberger 983cb76319 Remove print statement 2013-02-22 17:05:39 +01:00
Johannes Schönberger 614023b941 Replace ssize_t with Py_ssize_t globally 2013-02-22 17:05:38 +01:00
Johannes Schönberger 9f55fa2112 Change type to ssize_t for all index and size variables 2013-02-22 17:05:10 +01:00
Johannes Schönberger c9f72e93d6 Change type to ssize_t for all index and size variables 2013-02-22 17:05:10 +01:00
Stefan van der Walt 18aef47100 Merge pull request #395 from jni/jni-slic-bw
ENH: Allow grayscale input images to SLIC segmentation.
2012-12-22 11:42:19 -08:00
Tony S Yu 7c0424fd83 Merge pull request #378 from sergeyk/master
Fixed RGB<->XYZ conversion (was incorrect before).
2012-12-18 07:57:06 -08:00
Tony S Yu 08da07b1cd Merge pull request #377 from jni/jni-segmentation-join
Add functions to join and relabel segmentations
2012-12-17 06:44:47 -08:00
Juan Nunez-Iglesias 35e8ad2ccc Allow grayscale input images to SLIC segmentation
There is no reason for SLIC to be restricted to colour/RGB images. I
have added a few lines that allow single-channel input.
2012-12-17 16:45:23 +11:00
Juan Nunez-Iglesias 2ebac38c4d Rename ar to label_field for clarity 2012-12-17 16:37:41 +11:00
Juan Nunez-Iglesias e3951a2a78 Rename ar_relabeled to relabeled for simplicity 2012-12-12 14:31:05 +11:00
Johannes Schönberger 33c58ad854 Fix some doc string formatting issues of random walker 2012-12-09 23:19:42 +01:00
Johannes Schönberger a410f1c47e UmfPack warning is now only raised if random walker is explicitly called 2012-12-09 23:17:06 +01:00
Tony S Yu bf28a38f6e ENH: Make black the default boundary color for mark_boundaries.
This improves visibility in light-colored image regions. Note also that the new behavior matches the behavior from the 0.7 release.
2012-12-02 16:02:27 -05:00
Andreas Mueller b5d1e9f209 FIX quickshift nosetest with different xyz color conversion 2012-11-30 15:36:01 +01:00
Juan Nunez-Iglesias b906082034 Add testing functions for join and relabel 2012-11-28 12:48:13 +11:00
Juan Nunez-Iglesias dc377970f5 Add functions to join and relabel segmentations
The join of two segmentations is the segmentation in which two voxels
are in the same segment if and only if they are in the same segment in
both input segmentations.
2012-11-28 12:22:14 +11:00
Paul Ivanov b4b090271d complete singularization of scikit-image
I've updated references in the code and documentation to the new name.
2012-10-08 16:29:55 -07:00
Tony S Yu ad53159d60 STY: Rename highlight_boundaries to mark_boundaries 2012-10-07 19:23:38 -04:00
Tony S Yu 694ac11f93 STY: Rename visualize_boundaries to highlight_boundaries
Add @deprecated decorator to ease the transition.
2012-10-07 15:43:28 -04:00
Tony S Yu 500b1c507c ENH: Add grayscale support and color adjustment to visualize_boundaries 2012-10-07 15:33:03 -04:00
cgohlke e9790800d3 Fix ValueError: Buffer dtype mismatch on 64 bit platforms 2012-09-29 15:36:55 -07:00
Andreas Mueller 6c59e04714 MISC remove unused imports, some pep8 corrections. 2012-09-27 20:01:45 +01:00
Stefan van der Walt 03a701c831 Merge pull request #323 from emmanuelle/bug_rw
BUG: Correct a newly appeared bug in the random walker.
2012-09-19 17:53:25 -07:00
Emmanuelle Gouillart 6635cf16db [BUG] Corrected a bug in the random walker that appeared
* when returning the full probability instead of the segmentation
    * for three or more labels (two was OK)
2012-09-18 19:56:52 +02:00
Johannes Schönberger 9cc77d1138 Merge pull request #317 from tonysyu/testing-compatibility
Add `assert_greater` compatibility function.
2012-09-17 22:34:26 -07:00
JDWarner ee2092c6fa Documentation fix for labels input in random_walker.
This fix was needed because `labels` claimed it should be "of same
shape as `data`", but this is no longer always the case. When
multichannel=True, `labels` should be shaped like a SINGLE channel
of `data`, i.e. without the final dimension denoting channels.
2012-09-17 16:38:59 -05:00
Tony S Yu f2d5b109e9 Add assert_greater compatibility function.
Fix tests to work with nose < 1.1.3. Compatibility functions borrowed from scikit-learn.
2012-09-13 22:17:24 -04:00