Stefan van der Walt
f64fb76b95
Merge pull request #1695 from MartinSavc/adding_makefile_params
...
Add variables to Makefile for specifying executables
2015-09-04 10:08:12 -07:00
Johannes Schönberger
a664043197
Merge pull request #1667 from odebeir/sprint_euroscipy2015_denoise
...
Sprint euroscipy2015 denoise
2015-09-04 08:49:09 -04:00
martin
0f0fa824ad
added variables to Makefile for build time configuration
2015-09-04 10:43:55 +02:00
Steven Silvester
865b8e4e20
Merge pull request #1683 from jwiggins/travis-tweaks
...
Fix some things on Travis
2015-09-03 20:26:02 -05:00
Steven Silvester
ec62b2ce60
Merge pull request #1694 from ahojnnes/regionprops-dtype
...
Enforce integral type for label images
2015-09-03 20:24:18 -05:00
Johannes Schönberger
ca5de50079
Enforce integral type for label images
2015-09-03 16:22:32 -04:00
Juan Nunez-Iglesias
09c724cccf
Merge pull request #1674 from robintw/canny-percentile-thresholds
...
Added quantile_threshold option to canny edge detection
2015-09-03 18:00:52 +02:00
Olivier Debeir
f5e4a5e44d
remove import/blank lines
2015-09-02 16:01:13 +02:00
Johannes Schönberger
b21f01ddfd
Merge pull request #1684 from juliusbierk/hough-circle-input
...
hough_circle radius accepts scalars and lists
2015-09-02 09:26:25 -04:00
John Wiggins
b91f6acb8f
Remove imread from the optional requirements for 2.7
2015-09-01 19:58:08 +02:00
John Wiggins
0e46d2cd82
Make sure the pip in the virtualenv is upgraded.
...
Additionally, list the installed packages after each of the two installation
phases.
2015-09-01 08:59:15 +02:00
Steven Silvester
0ff4b8f2e4
Merge pull request #1687 from connellybarnes/master
...
fix scikit-image bug #1680 (grayscale png round trip fails) and add u…
2015-08-31 22:16:56 -05:00
Steven Silvester
7b5d82d878
Merge pull request #1688 from robintw/add-make-bat-for-docs
...
Added make.bat file for building docs on Windows
2015-08-31 22:16:16 -05:00
John Wiggins
8a5cc800cb
Revert pip cache changes. Use pip's built-in retry.
2015-08-31 20:26:22 +02:00
Connelly Barnes
28a4fcd37e
fix permissions issue in test_pil.py function test_png_round_trip()
2015-08-30 21:20:28 -04:00
Robin Wilson
27730d11ab
Added make.bat file for building docs on Windows
...
This is usually created automatically by sphinx-quickstart, but seems
to be missing in skimage. It caused a number of problems for Windows
users during the EuroSciPy 2015 sprints.
2015-08-30 23:05:12 +01:00
Robin Wilson
5cf7a2013d
Fixed tests to use assertRaises as a function not a context manager
2015-08-30 22:49:24 +01:00
Connelly Barnes
4ca1f49d20
fix scikit-image bug #1680 (grayscale png round trip fails) and add unit test
2015-08-30 11:51:04 -04:00
Julius Bier Kirekgaard
e79a0a2dc1
Added pep8 spaces
2015-08-30 15:35:50 +01:00
Julius Bier Kirekgaard
8c5ce8504a
assert equal scalar, seqeunce output of hough circle
2015-08-30 15:13:45 +01:00
Julius Bier Kirekgaard
9a4a3c674e
test and docstring update for hough_circle
2015-08-30 13:16:33 +01:00
Julius Bier Kirekgaard
29fd2864cd
hough_circle radius accepts scalars and lists
2015-08-30 12:52:38 +01:00
John Wiggins
05e6c0cb76
Fix some things on Travis
...
- Now using the latest pip
- imread wasn't actually being installed
- Optional package installation uses a requirements file
- `python setup.py develop` instead of the previous two-step.
2015-08-30 13:50:03 +02: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
Robin Wilson
98bf488241
Fixed indentation
2015-08-29 23:26:22 +01: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
Robin Wilson
9f878affbc
Renamed keyword arg to use_quantiles
2015-08-29 16:25:42 +01: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
Robin Wilson
f9887e61e5
Added test for invalid quantile inputs
2015-08-29 14:14:13 +01:00
Robin Wilson
5f0665c99b
Raise ValueError if quantile thresholds outside of [0, 1] - and updated docs
2015-08-29 13:46:56 +01: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
Robin Wilson
b29ad8ef6d
Added quantile_threshold option to canny edge detection
...
This allows you to specify the high and low thresholds as quantiles of the edge magnitude
image, rather than as absolute edge magnitude values
2015-08-28 22:30:42 +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