Commit Graph

7389 Commits

Author SHA1 Message Date
Julius Bier Kirekgaard 6f1ec347f4 Fixed missing scipy import 2015-11-01 02:03:27 +00:00
Julius Bier Kirekgaard 55e12b6352 py3 fixes and skip test for old scipy. 2015-10-28 19:02:59 +00:00
Julius Bier Kirekgaard 5c20ef7218 pep8 and py3 compliance. more comments 2015-09-09 15:44:35 +01:00
Julius Bier Kirekgaard 8d344d090f Active contour updates. Now works with scipy<0.14 2015-09-05 13:29:59 +01:00
Julius Bier Kirekgaard 94b335fb2e change test names 2015-08-31 21:52:47 +01:00
Julius Bier Kirekgaard fa6815404f spelling corrections and misc. 2015-08-31 21:48:32 +01:00
Julius Bier Kirekgaard 96847f2652 pep8 and other small changes 2015-08-31 20:28:28 +01:00
Julius Bier Kirekgaard 7c30f36d85 Active contour example added 2015-08-31 19:12:35 +01:00
Julius Bier Kirekgaard ad4948a609 pep8 compliance 2015-08-31 16:37:21 +01:00
Julius Bier Kirekgaard 646c2102d2 Added active contour model 2015-08-31 16:15:08 +01:00
Emmanuelle Gouillart 069c575955 Merge pull request #1659 from rougier/gallery-cleaning
Gallery example improvement
2015-08-30 11:49:34 +02:00
Juan Nunez-Iglesias b630f54e13 Merge pull request #1671 from jwiggins/fix-cubehelix-ref
Replace cubehelix with the viridis colormap in the RAG drawing example
2015-08-30 10:40:48 +01:00
Emmanuelle Gouillart 01f5fc4e72 Merge pull request #1663 from juliusbierk/hough-circle-example
Example for hough_circle
2015-08-30 11:29:27 +02:00
Nicolas Rougier 6c421cd366 Fix style (pep8) 2015-08-30 09:35:44 +02:00
Emmanuelle Gouillart fa9e000ae4 Merge pull request #1631 from stefanv/rename_denoise_nl_means
Rename denoise nl means
2015-08-29 17:33:05 +02:00
Emmanuelle Gouillart 05729acb7d Merge pull request #1660 from jwiggins/issue-1586
Raise an error for negative sigma values in guassian_filter.
2015-08-29 15:59:12 +02:00
Juan Nunez-Iglesias ae17d88637 Merge pull request #1673 from oew1v07/watershed_markers
Updated the explanation of the watershed markers example.
2015-08-29 11:44:41 +01:00
Nicolas Rougier 21f655edf7 Merge branch 'gallery-cleaning' of github.com:rougier/scikit-image into gallery-cleaning
* 'gallery-cleaning' of github.com:rougier/scikit-image:
  Rescale intensity to enhance image output
  Switched lena for astronaut
  Remove ticks, add titles and reverse color such that contours are visible
2015-08-29 11:43:12 +02:00
Nicolas Rougier 1bc1688b97 Rescale intensity to enhance image output 2015-08-29 11:42:42 +02:00
Nicolas Rougier b459107f89 Switched lena for astronaut 2015-08-29 11:42:42 +02:00
Nicolas Rougier e9cf4027e0 Remove ticks, add titles and reverse color such that contours are visible 2015-08-29 11:42:42 +02:00
Emmanuelle Gouillart d69960973b Merge pull request #1675 from dpshelio/titles
Gallery - Fixing titles of some plots
2015-08-29 11:31:42 +02:00
Olivia 81ba4db3b1 Split comment into two lines 2015-08-29 10:02:15 +01:00
David PS 64f8d44314 Titles of the plots for the wathershed example not seeing for the margins of the plot. 2015-08-29 10:00:15 +01:00
Olivia 8ad487e059 Split comment into two rows 2015-08-29 09:54:09 +01:00
John Wiggins 38d8e9f5f2 Import viridis from skimage.util.colormap.
viridis is not yet available in a released matplotlib. For now, use
the one in skimage.
2015-08-29 09:13:07 +02:00
oew1v07 5bd900f94a Merge pull request #2 from dpshelio/watershed_markes
Now yes!!
2015-08-28 22:32:21 +01:00
David PS 2a0f29011f fixed another typo 2015-08-28 22:30:21 +01:00
Olivia f63d942d9d Grammatical error/typo fixed 2015-08-28 22:11:55 +01:00
Olivia a5af3a6e93 Updated the explanation of the watershed markers example.
This fixes issue #1650
2015-08-28 21:52:35 +01:00
John Wiggins 2a6e7ffdfc Replace cubehelix with the viridis colormap in the RAG drawing example 2015-08-28 22:17:21 +02:00
Julius Bier Kirekgaard b5fd7bc885 Fixed forgotten output for docstring example 2015-08-28 21:09:42 +01:00
Julius Bier Kirekgaard 002fc70759 Shorter hough_circle example 2015-08-28 21:04:52 +01:00
Julius Bier Kirekgaard 3c41e75b22 Added whitespace to comply with pep8 2015-08-28 20:46:14 +01:00
Juan Nunez-Iglesias ddf122f34b Merge pull request #1666 from rougier/convex_hull_example
Remove ticks from image display in examples.
2015-08-28 20:40:01 +01:00
Nicolas Rougier d395d0cf2b Rescale intensity to enhance image output 2015-08-28 21:35:36 +02:00
Nicolas Rougier 26d427baef Removed ticks 2015-08-28 21:26:24 +02:00
John Wiggins 6e6d243dbd Use assert_raises instead of @raises. 2015-08-28 21:19:20 +02:00
John Wiggins a0fc75c7cb Don't use two lines to raise an exception with a short message. 2015-08-28 21:10:39 +02:00
Juan Nunez-Iglesias d9dbe6f506 Merge pull request #1658 from Guanaco77/master
Add documantation to `denoise_bilateral` for `sigma_range`
2015-08-28 20:09:03 +01:00
Nicolas Rougier 31f44f475f Switched lena for astronaut 2015-08-28 21:08:57 +02:00
Julius Bier Kirekgaard 5f5af64551 Example for hough_circle 2015-08-28 20:08:11 +01:00
John Wiggins c05108da36 Replace a doc test with some regular unit tests. 2015-08-28 21:03:01 +02:00
Stefan van der Walt 7c8caac5e6 Merge pull request #1656 from cgilon/contribute-docs-fix-link
Fix link to numpy docs convention
2015-08-28 11:54:36 -07:00
Arnaud De Bruecker 50804d1e9b Correct documentation to denoise_bilateral for sigma_range
Closes #1630
2015-08-28 19:43:14 +01:00
John Wiggins ff4e3bd0bd Raise an error for negative sigma values in guassian_filter. 2015-08-28 20:37:26 +02:00
Nicolas Rougier 239574a2c4 Remove ticks, add titles and reverse color such that contours are visible 2015-08-28 20:18:13 +02:00
Juan Nunez-Iglesias f71cc06d8f Merge pull request #1657 from robintw/doc-readme-typo
Fixed typo in docs README
2015-08-28 19:17:02 +01:00
Arnaud De Bruecker 955b1761f1 Add documantation to denoise_bilateral for sigma_range
closes #1630
2015-08-28 19:10:09 +01:00
Robin Wilson 32e6aa1e9c Fixed typo in docs README 2015-08-28 19:00:28 +01:00