Commit Graph
8366 Commits
Author SHA1 Message Date
martin 629d6d6abc changed subplot creation to preferred matplotlib style 2015-10-12 17:48:30 +02:00
martin f8e632c6b1 changed subplot creation to preferred matplotlib style 2015-10-12 17:44:02 +02:00
martin 0ffa83113a changed subplot creation to preferred matplotlib style 2015-10-12 17:38:08 +02:00
martin d42b06e69e changed subplot creation to preferred matplotlib style 2015-10-12 16:15:39 +02:00
martin c65b095ec7 added parameters for axes sharing to plt.subplots 2015-10-12 15:58:57 +02:00
martin e7f5dff215 added parameters for axes sharing to plt.subplots 2015-10-12 15:58:57 +02:00
martin ada92ae75e replaced subplots with individual subplot calls
share axes for the related images in subplost 221 and 223
2015-10-12 15:58:57 +02:00
martin bb081ebd0a added sharex, sharey and adjustable parameters to subplots 2015-10-12 15:58:57 +02:00
martin 9fa9c0387c adding axes sharing to displays of related images
for better interaction

sharing achieved by setting sharex and sharey, and
setting the axes 'adjustable' parameter to 'box-forced'
2015-10-12 15:58:57 +02:00
martin 8ff6d2d8e3 changed adjustable parameter of axes to 'box-forced'
this fixes the size of axes around an image for shared axes
2015-10-12 15:58:57 +02:00
martin 681be3fc58 adding shared axes to examples with multiple plots 2015-10-12 15:58:57 +02:00
JGoutin bf9eb6c8de Update __init__.py
A little optimization: Now, don't need to import "sys" and will also work if Skimage imported from a byte-compilled Python distribution.
2015-10-09 13:38:03 +02:00
JGoutin d43351c578 Import fail if python is runned with -OO
Hello,

This fix a crash on skimage import if Python compilation optimization is set to 2 (Remove docstrings / Run python with -OO argument)
2015-10-09 12:21:13 +02:00
Josh Warner a2d74e5260 Merge pull request #1421 from hohlraum/hough_fix
FIX: Fix missing peaks in hough_line_peaks.
2015-10-08 18:48:48 -07:00
Olivia Wilson 2045c44d1f Removed trailing whitespace 2015-10-07 11:30:20 +01:00
Olivia Wilson 07775b6b54 Merge branch 'remove_small_holes' of https://github.com/oew1v07/scikit-image into remove_small_holes
Need to merge with work completed elsewhere
2015-10-07 11:00:02 +01:00
Olivia Wilson 815c5c8ee7 Added new line 2015-10-07 10:59:26 +01:00
sumitbinnani bfba746a91 Adapting Edited Files to comply with PEP8 Standards
Changing Indentation as per PEP8 Guidelines
2015-10-07 14:21:36 +05:30
Juan Nunez-Iglesias 387cbda55a Merge pull request #1744 from blink1073/always-use-tiff
Move tiff-file handling to top level
2015-10-07 15:57:34 +11:00
Steven Silvester 1dae599eb1 Remove another tiff check in test_pil 2015-10-06 20:19:06 -05:00
Steven Silvester 1547ec39f3 Remove the tifffile save tests from test_pil 2015-10-06 20:18:16 -05:00
Steven Silvester d7a648ad55 Pop the img_num keyword if given 2015-10-06 19:58:50 -05:00
Steven Silvester e7b67618fd Move tiff-file handling to top level 2015-10-06 19:45:28 -05:00
Josh Warner 844b8b9052 Merge pull request #1738 from blink1073/test-3.5
TST: Test against py35, remove py32 test
2015-10-06 17:26:58 -07:00
Steven Silvester 4ccf7787a3 Remove 3.2 from travis build 2015-10-06 19:02:37 -05:00
Stefan van der Walt d66babe9bb Merge pull request #1741 from escorciav/peak-local-max-output-type
Fix output type of `peak_local_max`
2015-10-06 00:20:33 -07:00
sumitbinnani 0bae5f9137 Adding Alias and Deprecation Warning
* Added alias and deprecation warning for
```skimage.filters.gabor_filter```.
* Added alias and deprecation warning for
```skimage.filters.gaussian_filter```.
* Updated ```TODO.txt```
2015-10-06 00:18:38 +05:30
Victor Escorcia 7254c1e7b2 Fix output type of peak_local_max 2015-10-03 22:12:03 +03:00
sumitbinnani 811b6895cf Refactoring ``skimage.filters.gabor_filter` to `skimage.filters.gabor``
Refactoring ```skimage.filters.gaussian_filter``` to ```skimage.filters.gaussian```
2015-10-04 00:15:53 +05:30
Steven Silvester 730297def6 Use Dask 0.7.1 on Python 3.2
Try dask 0.7.2

Try dask 0.7.1

Fix comment
2015-10-03 13:34:14 -05:00
Steven Silvester 0d9987e2b3 Test against Python 3.5 on Travis
Add a test against py35

Restore PySide install for 3.5

Do not try and install simpleitk on py35

Fix syntax in optional requirements file

Allow simpleitk on python 3.4

Do not try simpleitk on py3.4
2015-10-03 13:34:02 -05:00
Olivia 9025c020ae Adjusting spacing of array in doctests 2015-09-25 14:55:13 +01:00
Olivia 5c7c67db12 Made changes to doctests 2015-09-25 14:51:06 +01:00
Olivia Wilson 19fbdfb6fe Adjusted white space for doctests 2015-09-24 11:58:40 +01:00
Olivia Wilson 413ac4a53b Altered doctests to correct spacing 2015-09-23 21:24:11 +01:00
Olivia a3bb9401c2 Moved the comments on labeled arrays to notes section 2015-09-22 17:41:22 +01:00
Olivia 3f735b6482 Changed the test file to use expected warnings.
This is with help from @blink1073
2015-09-22 17:35:32 +01:00
Charles e822e5a556 DOC : add ref to nlmeans in the API 2015-09-22 11:14:33 +02:00
Juan Nunez-Iglesias 953fbfc539 Merge pull request #1725 from sciunto/unclosedfile
MAINT: use with to close the file
2015-09-22 16:14:39 +10: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
Steven Silvester 9371ae7aa5 Merge pull request #1724 from sciunto/unclosedfile
MAINT: use with to close the file
2015-09-21 21:16:22 -05:00
François Boulogne 14588366e5 MAINT: use with to close the file 2015-09-21 21:47:06 -04:00
Stefan van der Walt 4e21f5dcef Merge pull request #1722 from blink1073/add-doc-deploy-notes
Add notes on how to deploy docs on Travis
2015-09-19 19:41:42 -07:00
Steven Silvester 05d0202712 Add notes on how to deploy docs on Travis 2015-09-19 21:19:48 -05:00
Johannes Schönberger 9ac63b32b8 Merge pull request #1721 from sciunto/fixurl
DOC fix broken url
2015-09-19 13:37:11 -04:00
François Boulogne 42784a45bc DOC fix broken url 2015-09-19 13:10:23 -04:00
Stefan van der Walt d661361c27 Merge pull request #1720 from blink1073/another-token-attempt
Try doc upload with a token encrypted in this repo
2015-09-19 08:13:39 -07:00
Steven Silvester 252cf8b5b9 Try with a token encrypted in this repo 2015-09-19 08:47:28 -05:00
Stefan van der Walt 2063dd109c Merge pull request #1719 from blink1073/another-docs-build
Encrypt token for target repo
2015-09-18 21:34:24 -07:00
Steven Silvester b272785409 Fix variable name 2015-09-18 21:33:35 -05:00