wassname/scikit-image
1
0
Fork 0
mirror of https://github.com/wassname/scikit-image.git synced 2026-07-23 13:10:18 +08:00
Code Issues Packages Projects Releases Wiki Activity
7,268 Commits 8 Branches 45 Tags
24b3a81dd9b4aa9e6374c033f74ff4572964a33e
Commit Graph
7268 Commits
This Branch
This Branch
All Branches
Author SHA1 Message Date
Josh Warner 24b3a81dd9 Merge pull request #1604 from blink1073/pil-close 
FIX: Do not let PIL manage the file handle.
 2015-07-14 21:47:32 -05:00
Juan Nunez-Iglesias 7124716d24 Merge pull request #1547 from blink1073/adapthist-window 
Update Adapthist to use more intelligent tiles
 2015-07-14 14:08:17 -04:00
Steven Silvester 8122e26731 Add another file guard 2015-07-14 09:28:53 -05:00
Steven Silvester 80fe225fc8 Fix failing test 2015-07-14 07:47:22 -05:00
Steven Silvester 085be65e83 Remove use of view_as_window and fix docstring 2015-07-14 07:47:22 -05:00
Steven Silvester 603844431a More variable renaming 2015-07-14 07:47:22 -05:00
Steven Silvester 323a2791bb Rename variable for clarity 2015-07-14 07:47:22 -05:00
Steven Silvester d755decf15 Remove debug print 2015-07-14 07:47:22 -05:00
Steven Silvester acc9a8a748 Use smarter indexing 2015-07-14 07:47:22 -05:00
Steven Silvester 1f56de9595 Remove min_overlap kwarg 2015-07-14 07:47:22 -05:00
Steven Silvester c948f9fe97 Fix view as windows test 2015-07-14 07:47:22 -05:00
Steven Silvester 3aafbb78dd Rename optimal_step and add comments 2015-07-14 07:47:22 -05:00
Steven Silvester 489ae2ec1a Fix rebase error 2015-07-14 07:47:22 -05:00
Steven Silvester 944e7204b7 wip 
wip

Update tests

Docstring and TODO

Update docstring

Style fixes

Update equalize_adapthist to use new view_as_windows

Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

Style fixes

Add a deprecation warning and add to api_changes.txt

Update TODO and switch to 0.13 deprecation

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

Move the new kwarg to the very end

Clarify deprecation warning

Update to use row/col in clahe

Update docstring

Use optimal_step to set up view_as_windows

Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

Style fixes

Add a deprecation warning and add to api_changes.txt

Update TODO and switch to 0.13 deprecation

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

Move the new kwarg to the very end

Clarify deprecation warning

Update docstring
 2015-07-14 07:47:22 -05:00
Steven Silvester 5ba3cad178 Update tests 
Docstring and TODO

Update docstring

Style fixes

Update equalize_adapthist to use new view_as_windows

Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

Style fixes

Add a deprecation warning and add to api_changes.txt

Update TODO and switch to 0.13 deprecation

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

Move the new kwarg to the very end

Clarify deprecation warning

Update to use row/col in clahe

Update docstring

Use optimal_step to set up view_as_windows

Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

Style fixes

Add a deprecation warning and add to api_changes.txt

Update TODO and switch to 0.13 deprecation

Preserve the current API as much as possible and defer to 0.14
 2015-07-14 07:47:21 -05:00
Steven Silvester 733b62890a Docstring and TODO 
Update docstring

Style fixes

Update equalize_adapthist to use new view_as_windows

Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

Style fixes

Add a deprecation warning and add to api_changes.txt

Update TODO and switch to 0.13 deprecation

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

Move the new kwarg to the very end

Clarify deprecation warning

Update to use row/col in clahe

Update docstring

Use optimal_step to set up view_as_windows

Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

Style fixes

Add a deprecation warning and add to api_changes.txt

Update TODO and switch to 0.13 deprecation
 2015-07-14 07:47:21 -05:00
Steven Silvester e42cb6fadf Update docstring 
Style fixes

Update equalize_adapthist to use new view_as_windows

Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

Style fixes

Add a deprecation warning and add to api_changes.txt

Update TODO and switch to 0.13 deprecation

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

Move the new kwarg to the very end

Clarify deprecation warning

Update to use row/col in clahe

Update docstring

Use optimal_step to set up view_as_windows

Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

Style fixes

Add a deprecation warning and add to api_changes.txt
 2015-07-14 07:47:21 -05:00
Steven Silvester 6017e38e67 Style fixes 
Update equalize_adapthist to use new view_as_windows

Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

Style fixes

Add a deprecation warning and add to api_changes.txt

Update TODO and switch to 0.13 deprecation

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

Move the new kwarg to the very end

Clarify deprecation warning

Update to use row/col in clahe

Update docstring

Use optimal_step to set up view_as_windows

Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

Style fixes
 2015-07-14 07:47:21 -05:00
Steven Silvester 998be36c2d Update equalize_adapthist to use new view_as_windows 
Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports

Style fixes

Add a deprecation warning and add to api_changes.txt

Update TODO and switch to 0.13 deprecation

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

Move the new kwarg to the very end

Clarify deprecation warning

Update to use row/col in clahe

Update docstring

Use optimal_step to set up view_as_windows

Update equalize_adapthist to use new view_as_windows

Try rbase again

Update equalize_adapthist to use new view_as_windows

Fix relative imports
 2015-07-14 07:47:21 -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 f6653b781f Fix tifffile plugin import 2015-07-14 07:45:41 -05:00
Steven Silvester b67a4e3076 Move the tifffile wrapper to tiff plugin 2015-07-14 07:45:41 -05:00
Steven Silvester 182a6f6904 Fix handling of tiffile handles 2015-07-14 07:45:41 -05:00
Steven Silvester 6d7e0554a4 Use context manager for tif imread as well 2015-07-14 07:45:41 -05:00
Steven Silvester 66805cabdf Try fixing the remaining unclosed error 2015-07-14 07:45:41 -05:00
Steven Silvester 2fb59b9243 Fix variable name 2015-07-14 07:45:41 -05:00
Steven Silvester 1a27bea7da Allow pil imread to accept file-like objects again 2015-07-14 07:44:34 -05:00
Steven Silvester f1471dfd72 Remove offending line 2015-07-14 07:44:34 -05:00
Steven Silvester 7720527c95 Fix imsave test 2015-07-14 07:44:34 -05:00
Steven Silvester e1596aef1b Remove unclosed file guards 2015-07-14 07:44:34 -05:00
Steven Silvester 3272b85f86 Do not let PIL handle the file handle 2015-07-14 07:44:34 -05:00
Josh Warner 2690fef1db Merge pull request #1607 from blink1073/faster-travis 
TST: Use new Travis containers for faster CI builds
 2015-07-14 07:42:20 -05:00
Steven Silvester a939eb4ce6 Use a container and pip cache 
Use container and pip cache

Add the sudo calls back in

Try removing sudo and the tk install

Skip show() call in novice doctest

Try not building docs and no libqt4-dev

Try the optional installs right away

Do not install PyQt4 or imread

Try without libfreeimage

Try and install libfreeimage outside of root

Another attempt at libfreeimage

Yet another attempt at libfreeimage

Use the travis whitelist

Try adding the sudo command

Try and build the docs

Install scikit-image first

Restore full build functionality

Fix whitespace

Remove unused tk import
 2015-07-13 21:22:44 -05:00
Stefan van der Walt aa420d8589 Merge pull request #1606 from blink1073/fix-setup-numpy 
Mimic the way scipy handles numpy in setup.py
 2015-07-13 01:16:02 -05:00
Steven Silvester 09503cd168 Fix docstring 2015-07-12 22:27:41 -05:00
Steven Silvester 39b8198250 Fix typo 2015-07-12 22:26:07 -05:00
Steven Silvester 43168c60a6 Mimic the way scipy handles numpy in setup.py 2015-07-12 22:21:40 -05:00
Josh Warner 17b882aae5 Merge pull request #1565 from blink1073/viewer-ax 
ENH: Allow viewer plot plugin to have tools.
 2015-07-12 15:24:55 -05:00
Steven Silvester 09c8a84a54 Merge pull request #1518 from stefanv/relative_imports 
Consistently use relative imports
 2015-07-12 14:41:06 -05:00
Steven Silvester 3bfd51cbe4 Merge pull request #1590 from jjhelmus/faster_tests 
Faster Unit Tests
 2015-07-12 14:38:25 -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 80397bd562 Merge pull request #1584 from JDWarner/enh_make_clean 
ENH: `make clean` now removes compiled .c and .pyd files
 2015-07-12 13:05:24 -05:00
Josh Warner (Mac) 1d1a1a776d Remove only .c files associated with .pyx source. 2015-07-12 13:04:21 -05:00
Josh Warner 81d89b5518 Merge pull request #1598 from stefanv/bug/line_aa_horiz_vert 
FIX: Fix and clean up anti-aliased line drawing
 2015-07-12 12:27:33 -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
Stefan van der Walt 0b983c1d28 Merge pull request #1596 from david1koeller/novice_picture_fixes 
Fix notebook display in novice module
 2015-07-12 12:10:29 -05:00
David Koeller d4d3eaa1f1 Remove Picture.scale and Picture._rescale from novice module 
The scale and rescale function was never used in the novice module.
These functions are extraneous in a novice code, and have no purpose there.

Also updated tests.
 2015-07-12 11:47:07 -05:00
Stefan van der Walt f2401190c3 Merge pull request #1600 from michaelpacer/fix_docs_sprint 
Remove tutorial links listed twice in user guide
 2015-07-12 11:37:53 -05:00
michaelpacer b140665f7e fixed documentation to remove redundant links 2015-07-12 11:19:27 -05:00
David Koeller d9213bedde Fix notebook display bug for novice module 
io.Image was previously removed, but the novice Picture still depended on it.
Now moved the relevant functionality back into the Picture class.
 2015-07-12 11:07:21 -05:00