Commit Graph

351 Commits

Author SHA1 Message Date
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
emmanuelle 59f8cbcdad Added chapter title formatting for numpy_images.rst 2016-07-02 21:47:17 +02:00
emmanuelle cc40e0c37a Documented the API change of gaussian and median. 2016-06-19 09:42:53 +02:00
Egor Panfilov 5f891dedc3 Removed deprecared sobel, prewitt, scharr, roberts filters 2016-06-18 18:53:59 +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
emmanuelle d998e7e534 Links to API in examples 2016-05-17 23:21:45 +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 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 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
Shaun Singh 35b35c5139 Fix broken Sphinx 2016-03-30 17:02:19 -07:00
Egor Panfilov 2b1a88dfb5 Removed deprecated filters.canny links 2016-03-24 21:40:19 +03:00
Egor Panfilov 0101aab546 Improved api_changes message 2016-03-24 07:59:07 +03:00
Egor Panfilov 3c803f95ef Removed deprecated filter module 2016-03-23 22:44:29 +03:00
Steven Silvester b2a2301df6 Merge pull request #1966 from vighneshbirodkar/gitignore
Modified .gitignore to properly ignore auto_example files
2016-03-19 12:44:45 -05:00
Vighnesh Birodkar c35813fdec Removed unnecessary blank_image.png file 2016-03-16 19:27:26 -04:00
Egor Panfilov 81970bab62 Added GitHub templates, moved CONTRIBUTING.md to .github 2016-03-17 01:49:58 +03:00
Stefan van der Walt c48302d70b Bring release notes and API changes in sync 2016-03-07 12:35:58 -08:00
Stefan van der Walt 89136157bb Remove lena image from test suite.
Results from the morphology module were compared against output from the
corresponding MATLAB functions, as applied to the lena test image.  This image
does not conform to the Debian Free Software Guidelines and had to be removed.
The output is now tested against results generated with the current version of
scikit-image (0.12.0), which is known to be correct due to the comparison
described above.
2016-03-06 23:16:11 -08:00
emmanuelle 50fa219975 Updated docversion.js 2016-03-05 17:44:41 +01:00
Johannes Schönberger e82849a544 Document API changes 2016-02-09 11:16:49 +01:00
Himanshu Mishra a7bcee2694 Update plugins doc page 2016-01-20 15:27:41 +05:30
Himanshu Mishra b4bf4ed768 Fix circular mask example in the user_guide 2016-01-16 10:47:09 +05:30
emmanuelle 55f5103dd8 Added sections to gallery of examples
Modified travis_script.sh to account for the new structure of the gallery

Added README.txt files in directories of gallery examples

Fixed references to gallery images in user guide pages

Fixed broken links
2015-12-19 15:28:15 +01:00
emmanuelle 5000449970 Fixed broken sphinx link 2015-12-11 00:44:16 +01:00
François Boulogne 605a0270b8 DOC: test piwik with piwik.sciunto.org 2015-10-13 05:38:16 -04:00
François Boulogne 811f13c1d6 MAINT: use with to close the file
MAINT: use with to close the file
2015-09-21 22:21:57 -04:00
François Boulogne 341039fec7 DOC: favicon path relative to source/ 2015-09-17 05:22:01 -04:00
François Boulogne b1c1bdf564 DOC: activate favicon in config 2015-09-16 21:42:33 -04:00
Steven Silvester 3345e95a53 Merge pull request #1699 from jwiggins/use-ccache
Enable ccache and Sphinx cache on Travis
2015-09-13 10:31:31 -05:00
John Wiggins 4fe753fd45 Use the current python version for the python intersphinx reference 2015-09-13 12:53:54 +02:00
François Boulogne 6094be05f9 [DOC] use favicon generated from skimage-branding 2015-09-06 08:14:17 +02:00
François Boulogne b2a26320a9 [DOC] add favicon 2015-08-31 16:51:16 +02:00
Josh Warner (Mac) 8d33d3d072 DOC: Fix intersphinx mapping w/fallbacks 2015-08-08 12:29:05 -05:00
Josh Warner (Mac) 60e15373a4 DOC: Link to GitHub source in documentation 2015-08-02 16:41:39 -05:00
Steven Silvester 1b30c68d28 # This is a combination of 10 commits.
# The first commit's message is:
Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

# This is the 2nd commit message:

Style fixes

# This is the 3rd commit message:

Add a deprecation warning and add to api_changes.txt

# This is the 4th commit message:

Update TODO and switch to 0.13 deprecation

# This is the 5th commit message:

Preserve the current API as much as possible and defer to 0.14

# This is the 6th commit message:

Move the new kwarg to the very end

# This is the 7th commit message:

Clarify deprecation warning

# This is the 8th commit message:

Update to use row/col in clahe

# This is the 9th commit message:

Update docstring

# This is the 10th commit message:

Use optimal_step to set up view_as_windows
2015-07-14 07:47:21 -05:00
Steven Silvester 19ede51fb0 Merge pull request #1594 from stefanv/doc/remove_toc
Remove invalid link to table of contents (closes #1593)
2015-07-12 14:37:20 -05:00
Stefan van der Walt b4320ebcb5 Merge pull request #1597 from library111/DocumentationChanges
Novice module documentation improvements
2015-07-12 12:27:19 -05:00
michaelpacer b140665f7e fixed documentation to remove redundant links 2015-07-12 11:19:27 -05:00
Leena P 8035ce72a5 Clarified that Bento Building is an alternative 2015-07-11 18:23:02 -04:00
Stefan van der Walt 5f0e9a6f0f Remove invalid link to table of contents (closes #1593) 2015-07-11 16:32:26 -05:00
Juan Nunez-Iglesias cba1cb1e1f Add blank line after ref to keep Sphinx happy ;) 2015-07-01 00:47:19 +10:00
Juan Nunez-Iglesias eb8aaeb61d Use Sphinx links to reference from contributing guide 2015-06-30 23:37:30 +10:00
François Boulogne 20e49b2ada add link joblib website 2015-06-13 20:36:11 -04:00
Juan Nunez-Iglesias 0d134987f9 Harmonize all ndimage usage across the library
Only two forms remain in use:

- `from scipy import ndimage as ndi`
- `from scipy.ndimage import function`
2015-06-09 15:18:37 +10:00
Stefan van der Walt 580db16cb1 Simplify installation instructions 2015-06-07 07:56:41 -07:00
Christoph Gohlke 29c49e914b DOC: add WinPython distribution; correct spelling 2015-06-06 22:12:47 -07:00
arve0 89521548a6 update install instructions 2015-05-28 14:45:29 +02:00
Steven Silvester 26fa9c75d0 Merge pull request #1499 from stefanv/doc_style
Sync doc theme with website
2015-05-19 20:46:10 -05:00