Commit Graph
5840 Commits
Author SHA1 Message Date
Geoffrey French 29763582f5 Fixed Python 3 error in plot_windowed_histogram caused by use of incorrect division operator. Also tweaked the similarity computation a little. 2014-09-01 20:29:17 +01:00
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
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
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
Stefan van der Walt c30db5915a Merge pull request #1121 from Cadair/doc_theme_tweaks
Website font readability improvements.
2014-08-31 15:06:38 +01:00
Stuart Mumford f1a6d2dbf1 Website font readability improvements.
Increase font size by 1%
 Increase character spacing
 Increase font size in code snippets to website standard
2014-08-31 14:53:43 +01:00
Stefan van der Walt 517f9e0740 Merge pull request #1116 from rebeccaroisin/inplace_addition
Speed-up through in-place addition (closes gh-1089)
2014-08-31 13:44:30 +01:00
Rebecca 812b23d41f making in-place addition modification suggested in issue #1089 2014-08-31 11:37:35 +01:00
Josh Warner cc942364cd Merge pull request #1112 from pelson/docs_tidy
DOC: Minor documentation enhancements.
2014-08-31 11:34:41 +01:00
Phil Elson 00b5ac6804 Some minor documentation enhancements. 2014-08-31 11:21:23 +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
Juan Nunez-Iglesias badd7182ee Merge pull request #1106 from vighneshbirodkar/ncut_fix
Remove self loops in RAG
2014-08-18 09:54:00 -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
Johannes Schönberger f7a7c1baa2 Merge pull request #1105 from pmneila/master
Minor fix for bugs in HOG implementation
2014-08-17 21:16:39 -04:00
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
Johannes Schönberger 9ea0d27b12 Merge pull request #1102 from stefanv/bug/freeimage_uint16
freeimage: Correctly handle saving uint16 images (closes gh-1101)
2014-08-15 11:05:47 -04:00
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 6e09628fb9 update relase doc 2014-08-15 14:37:14 +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 e42c065243 corrected title 2014-08-15 14:11:53 +05:30
Vighnesh Birodkar 82f158482e removed file save 2014-08-15 14:11:53 +05:30
Vighnesh Birodkar cfaa83cf26 Chnaged palette in example 2014-08-15 14:11:53 +05:30
Vighnesh Birodkar 5c5b60df4c Chnaged palette in example 2014-08-15 14:11:53 +05:30
Vighnesh Birodkar 3553809c55 pep8 2014-08-15 14:11:53 +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 78caebf6d2 string wrap 2014-08-15 14:10:10 +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
Vighnesh Birodkar 6ef01cb4dc change ref format in example 2014-08-13 02:12:51 +05:30
Juan Nunez-Iglesias 7d991d2924 Merge pull request #1099 from blink1073/build_update_followup
Make suggested changes to build update

# @blink1073's comments for the PR:

@stefanv had a few late adds to #1084 that did not make the cut:

- Add `LICENSE.txt` in `_shared` for IPython and Spyder licenses.
- Style fixes in `painttool.py` and `version_requirements.py`
- Remove deprecated `--use-mirrors` for `matplotlib` install in `.travis.yml`

I also added a `travis_retry` before all of the `pip` installs since they sometimes timeout.
2014-08-12 05:15:14 -05:00
Steven Silvester 72f6a8c056 Make suggested changes to build update and use travis_retry for all installs. 2014-08-11 17:01:53 -05:00
Stefan van der Walt 693816c218 Merge pull request #1098 from ahojnnes/tox
Remove legacy CI config
2014-08-11 16:28:53 +02:00