Commit Graph

1324 Commits

Author SHA1 Message Date
Egor Panfilov 418de7e4f0 Merge pull request #2180 from sciunto/fix_mosaic
remove local threshold in try_all_threshold
2016-07-16 10:02:56 +03:00
Juan Nunez-Iglesias 694c56df88 Merge pull request #2181 from AbdealiJK/ajk/work
colorconv: Add rgba2rgb()
2016-07-16 01:53:27 -05:00
Juan Nunez-Iglesias 6853f16b77 Merge pull request #2106 from vighneshbirodkar/hm_doc
Improved region boundary RAG docs
2016-07-16 01:40:40 -05:00
AbdealiJK fc2089af32 colorconv: Add rgba2rgb()
rgba2rgb() is a conversion function which takes in a background RGB
color which is used to alpha blend with an RGBA image in the foreground.
The default value for this background is white (255, 255, 255).
2016-07-14 21:06:52 +05:30
Vighnesh Birodkar 8998d466ad Fixed typos 2016-07-14 11:14:12 -04:00
Vighnesh Birodkar 48daa261cf Typo and grammar corrections 2016-07-11 20:48:29 -04:00
François Boulogne 7a4b74f057 remove local threshold in try_all_threshold 2016-07-05 15:53:02 +02:00
emmanuelle 59f8cbcdad Added chapter title formatting for numpy_images.rst 2016-07-02 21:47:17 +02:00
Vighnesh Birodkar 5a78719a40 Change how the docstring is worded. 2016-06-28 21:34:35 -04:00
Juan Nunez-Iglesias eed7c41c32 Remove nonexistent kwarg from docstring, style fix
- Address @soupault's comments in the examples
- Fix minor spelling and wording errors
2016-06-21 13:17:05 -04:00
Hiyorimi 025e8c5499 Frangi filter support with tests + docstrings
+fixed tests and removed shared code

https://github.com/scikit-image/scikit-image/pull/2139#discussion_r67240635

docstrings and style fixes

fix Lambda yielding

more style fixes

enumerate & black line fixes
2016-06-21 13:15:05 -04:00
Egor Panfilov 030e623300 Merge pull request #2110 from sciunto/mosaic
ENH: try_all to choose the best threshold algorithm and DOC refactoring
2016-06-19 21:39:21 +03:00
François Boulogne 9fef985df8 Various fixes 2016-06-19 19:43:43 +02:00
emmanuelle cc40e0c37a Documented the API change of gaussian and median. 2016-06-19 09:42:53 +02:00
François Boulogne 25f5729d57 Switch to Otsu instead of mean 2016-06-19 09:35:05 +02:00
François Boulogne d870bcc5df Minor fixes 2016-06-18 23:39:09 +02:00
François Boulogne 2137aed5ec swap examples to show a different image inthe gallery 2016-06-18 20:20:34 +02:00
François Boulogne f25d93c511 Add see also 2016-06-18 20:20:34 +02:00
François Boulogne 476f6bd8f2 switch doc format to sphinx-gallery 2016-06-18 20:20:34 +02:00
François Boulogne 36d56b956d DOC: some improvements 2016-06-18 20:20:33 +02:00
François Boulogne 0a19def60c DOC: Gather threshold algo in gallery 2016-06-18 20:20:33 +02:00
François Boulogne 12fabff65f Some corrections 2016-06-18 20:20:33 +02:00
François Boulogne ecb84e7362 DOC: illustrate mosaic in gallery 2016-06-18 20:20:33 +02:00
François Boulogne 20f33e18fe DOC: add mosaic_threshold 2016-06-18 20:20:33 +02:00
François Boulogne a7cf3cbd52 DOC: rename thresholding example 2016-06-18 20:20:32 +02:00
Egor Panfilov 5f891dedc3 Removed deprecared sobel, prewitt, scharr, roberts filters 2016-06-18 18:53:59 +03:00
Johannes Schönberger 988689431d Fix indentation for example script 2016-06-09 08:37:36 +02:00
Johannes Schönberger 31e884207a Merge pull request #2129 from sciunto/axes
DOC: refactor axes with lists
2016-06-09 08:18:31 +02:00
Johannes Schönberger d7540b8a2e Merge pull request #2128 from sciunto/gallery_title
DOC: make a title shorter in gallery
2016-06-08 13:11:26 +02:00
François Boulogne f877491f58 DOC: refactor axes with lists 2016-06-07 16:31:02 +02:00
Egor Panfilov 47d0aa9d62 Merge pull request #2078 from emmanuelle/sphinx-gallery
Sphinx gallery for example gallery
2016-06-07 17:22:48 +03:00
emmanuelle 8b2dbd56e5 Minor fixes and improvements: PEP8, appearance, etc.
Removed a clumsy workaround (about paths)

Fixed links to image files to fix sphinx warning.

Removed non-ascii character

Another non ascii character

And another non-ascii character... (to be squashed later on)

Corrected some typos in the docstrings of sphinx-gallery files

These corrections have also been submitted as a patch to the original
sphinx-gallery project (#121)

Corrected the appearance of two examples of the gallery

Tweaked CSS for larger images

Added sphinx-gallery's license and a README.txt about the origin of
this directory.

Edited gabor_from_astronaut example for nicer popup

PEP 8 + minor fixes

Removed commented lines of code
2016-06-06 17:30:44 +02:00
François Boulogne 9c51c154ba DOC: make the title shorter 2016-06-05 17:29:53 +02:00
François Boulogne 8c9d8926c8 Minor enhancements 2016-06-02 13:35:36 +02:00
François Boulogne 80e8544067 Review threshold minimum 2016-06-02 10:32:00 +02:00
Jeff Hemmelgarn 31db1c607e Add threshold minimum algorithm 2016-06-02 10:32:00 +02:00
Vighnesh Birodkar bc11ca8a24 Improved region boundary RAG docs 2016-05-23 10:39:06 -04:00
emmanuelle d998e7e534 Links to API in examples 2016-05-17 23:21:45 +02:00
François Boulogne 2ef707337a DOC: update for new API 2016-05-17 22:39:39 +02:00
Vighnesh Birodkar a89f1735d4 docstring corrections and pep8 2016-05-11 17:33:14 -04:00
emmanuelle 94d051c124 Renamed README.txt to README.rst in gallery of examples 2016-05-10 23:17:06 +02:00
emmanuelle 41715501d4 Remove documentation links in examples (they crash) 2016-05-10 22:33:23 +02:00
emmanuelle 2ddf2ef01d Removed spurious import in conf.py 2016-05-10 21:49:15 +02:00
emmanuelle 52b0e16a78 Included sphinx-gallery files
I had to make a slightly modification in one of sphinx-gallery's files to
make it work with scikit-image. I opened a pull request on sphinx-gallery
github, hopefully we can delete the local copy after their next release.
2016-05-10 21:49:15 +02:00
emmanuelle 844858f01b Build gallery with sphinx-gallery
Modified comments in some gallery examples for compatibility with
sphinx-gallery parsing. Also modified some links in the narrative doc
since image file names have changed.
2016-05-10 21:49:15 +02:00
emmanuelle ef9bcfb778 A first pass to let the gallery build using sphinx-gallery. 2016-05-10 21:49:15 +02:00
Vighnesh Birodkar 35b193aa09 clarified merge function in docstring 2016-04-27 01:11:09 -04:00
Vighnesh Birodkar b3f6b545cb Added example for region boundary merging 2016-04-27 01:03:09 -04:00
Vighnesh Birodkar 2a87c07800 midway thru changes 2016-04-26 14:23:32 -04:00
Vighnesh Birodkar a406e270b1 Improved drawing in plot_rag_draw.py example (#1872)
Improved drawing in draw_rag example; changed draw_rag to show_rag, made it return ScalarMappable to draw colorbars; added magma colormap
2016-04-24 09:28:24 +03:00