Commit Graph

3708 Commits

Author SHA1 Message Date
Geoffrey French da93619e59 Fixed some issues with the new windowed_histogram function in filter.rank.
It used to be able to output uint8 histogram, whose max pixel counts of 255 could easily overflow. Addressed by limiting the output type to float.
Normalized histograms are now generated, otherwise behaviour is unpredictable at boundaries or when pixels are not permitted by a mask.
The new optional n_bins parameter allows the caller to specify the size of the histogram generated. Having it fixed to image.max()+1 could result in feature vectors being shorter than desired just due to a value not being used in an image.
An example has been added to the docs, that demonstrates the application of windows histograms in object matching; a single coin is extracted and found by chi squared histogram matching.
2014-08-31 22:25:45 +01:00
Geoffrey French 7ebb2388d2 Fixed some test failures and added a test for windowed_histogram. 2014-08-31 16:22:35 +01:00
Stefan van der Walt 997172d5ec Merge pull request #1124 from blink1073/master
Fix import when not built (closes gh-1108)
2014-08-31 16:07:25 +01:00
Geoffrey French d63d89497b Modified rank filters package so that the _core function in core.pyx outputs to a 3D image, permitting the generation of images with arbitrary size feature vector pixels. Implemented windowed_histogram that generates a windowed histogram of an image. 2014-08-31 16:04:38 +01:00
Steven Silvester a85a8bcd39 Fix #1108 2014-08-31 09:50:25 -05:00
Julien Coste f8a0f27265 hack to avoid circular import when import canny 2014-08-31 15:21:46 +01:00
Geoffrey French f87db0a1ec Fixes a bug in _update_doc in skimage/io/__init__.py that will attempt to compute max of empty list if no plugins are found. 2014-08-31 15:12:01 +01:00
Julien Coste f86b6212bc Canny is now deprecated and will be in api_changes in v0.13 2014-08-31 12:46:16 +01:00
Julien Coste 936211bbcb move import to avoid infinte recursion (filter import peak that import feature that import filter) 2014-08-31 12:15:47 +01:00
Julien Coste bfcc27587a fix import in filter.__init__ 2014-08-31 11:59:32 +01:00
Rebecca 812b23d41f making in-place addition modification suggested in issue #1089 2014-08-31 11:37:35 +01:00
Julien Coste b13ea2288a fix wrong version number 2014-08-31 11:01:08 +01:00
Josh Warner (Mac) af59d06461 ENH: Simplify marching_cubes for maintainability.
This does not change execution time, but the entire algorithm
is much simpler to read and understand without the branching
Cython code paths for anisotropic inputs. Memory usage decreases
a minor amount.
2014-08-31 11:00:41 +01:00
Julien Coste 23a6f0af6c remove auto added __author__ in __init__.py file 2014-08-31 11:00:16 +01:00
Julien Coste 8a337dbe46 Move canny from filter to feature 2014-08-31 10:55:12 +01:00
Juan Nunez-Iglesias 25d6c58674 Merge pull request #1087 from vighneshbirodkar/rag_draw
RAG drawing function
2014-08-18 10:05:58 -05:00
Vighnesh Birodkar 103f48bc00 Spelling error 2014-08-18 19:58:02 +05:30
Vighnesh Birodkar 12b1a91c70 remove self loops in rag 2014-08-18 18:42:23 +05:30
Pablo Márquez Neila 64e20d8173 Minor fix 2014-08-18 02:47:29 +02:00
Pablo Márquez Neila 808e53c7ae Code valid for all image dtypes 2014-08-18 02:12:27 +02:00
Pablo Márquez Neila 23bc3ed077 Replaced convolve1d by ad-hoc gradient computation 2014-08-18 01:34:54 +02:00
Pablo Márquez Neila a52cb01a49 Fix bugs in HOG 2014-08-17 22:09:03 +02:00
Vighnesh Birodkar 3f7ce2e670 Added example with cubehelix 2014-08-15 21:28:47 +05:30
Stefan van der Walt 2b1dde202f freeimage: Correctly handle saving uint16 images (closes gh-1101) 2014-08-15 15:22:51 +02:00
Vighnesh Birodkar 344e2a51c0 cast labels in ncut 2014-08-15 17:52:25 +05:30
Vighnesh Birodkar c43180fa27 force copy 2014-08-15 17:02:35 +05:30
Vighnesh Birodkar 4bb4076959 fixed imports 2014-08-15 14:15:02 +05:30
Vighnesh Birodkar 7730eb004e fixed init 2014-08-15 14:13:36 +05:30
Vighnesh Birodkar bcbfdb28f5 add desaturate option 2014-08-15 14:11:53 +05:30
Vighnesh Birodkar 5bd55071bc handled matplotlib not present case 2014-08-15 14:11:18 +05:30
Vighnesh Birodkar adeb8689af Fixed doctest 2014-08-15 14:10:38 +05:30
Vighnesh Birodkar 95b20adee7 None comparison 2014-08-15 14:10:37 +05:30
Vighnesh Birodkar 4005749a61 rebase and change API to support mpl colorspec 2014-08-15 14:10:37 +05:30
Vighnesh Birodkar 6928e5d9ef Corrected docstrings 2014-08-15 14:10:09 +05:30
Vighnesh Birodkar 5c662b4472 Docstrings 2014-08-15 14:10:09 +05:30
Vighnesh Birodkar f4aa0fc8e1 Formatting 2014-08-15 14:07:58 +05:30
Vighnesh Birodkar 39dfcc4144 Frist working copy of RAG draw 2014-08-15 14:07:58 +05:30
Juan Nunez-Iglesias a3638024e7 Merge pull request #1080 from vighneshbirodkar/ncut
Add normalized cut (ncut) on RAGs
2014-08-15 00:36:43 -05:00
Vighnesh Birodkar afa345f363 Update graph_cut.py 2014-08-14 23:47:00 +05:30
Vighnesh Birodkar b61763117d Update _ncut_cy.pyx 2014-08-14 23:45:30 +05:30
Steven Silvester 72f6a8c056 Make suggested changes to build update and use travis_retry for all installs. 2014-08-11 17:01:53 -05:00
Vighnesh Birodkar ab60edcdf7 Fix Reference format 2014-08-10 20:31:22 +05:30
Vighnesh Birodkar 4a231cfd35 Minor changes 2014-08-10 20:07:34 +05:30
Juan Nunez-Iglesias 3bc3b4f8e3 Merge pull request #1083 from adamfeuer/import_export_pil_image_objects
pil_plugin can import and export PIL image objects from memory
2014-08-09 19:48:31 -05:00
Adam Feuer 8494b8081a removed trailing blank line in comment 2014-08-09 10:37:11 -07:00
Vighnesh Birodkar 0c185629d3 corrected similarity 2014-08-09 22:09:12 +05:30
Vighnesh Birodkar 03d3873cc4 docstring of _label_all 2014-08-09 22:08:27 +05:30
Vighnesh Birodkar ded138cbcb test case for in place 2014-08-09 21:35:07 +05:30
Adam Feuer ef7da3be4a explicitly checking for None as per code review feedback
- instead of implicit (non-truthy) test
2014-08-09 09:04:05 -07:00
Adam Feuer 25f08ff68e removing trailing space (PEP8 formatting) 2014-08-09 09:03:06 -07:00