Commit Graph

4548 Commits

Author SHA1 Message Date
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 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 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
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
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
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
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
Stefan van der Walt 5eebce97ae Rename starting point of line 2015-07-12 09:47:42 -05:00
Stefan van der Walt a659aa1acc Fix and clean up anti-aliased line drawing (closes #1563) 2015-07-11 18:39:37 -05:00
Jonathan Helmus ba65c3562b TST: smaller arrays for bit comparison in test_rank for speed 2015-07-11 17:46:17 -05:00
Jonathan Helmus 2353113e49 TST: Smaller data array in 12-bit entropy test for speed 2015-07-11 17:34:28 -05:00
Leena P 80629c34bb Use a simpler operator in the novice tutorial
Using a more explicit series of operations is simpler than using the
compound "=/" operator, which may be unfamilar to newer users of Python.
2015-07-11 18:23:49 -04:00
Leena P 45eecd09d2 Updated novice module tutorial to show images
Providing visual feedback to a new user, by displaying their image, will
make a much friendlier introduction to Scikit Image.
2015-07-11 18:23:28 -04:00
Jonathan Helmus 89a717ef3f TST: Reduced size of image in test_blob:test_blob_log for speed 2015-07-11 16:40:32 -05:00
Jonathan Helmus 9c6ab1bc18 TST: Use quarter size images to speed up test_censure unit tests 2015-07-11 16:28:58 -05:00
Jonathan Helmus c63adf5254 TST: Remove no_time_for_that.gif from data 2015-07-11 15:46:34 -05:00
Stefan van der Walt 467253409f Subtle wording improvement to test setup docstring 2015-07-11 15:43:15 -05:00
Stefan van der Walt 83d5ff9001 Consistently use relative imports 2015-07-11 15:41:37 -05:00
Jonathan Helmus 80d4e813f9 TST: Use smaller gif file in test_pil tests 2015-07-11 14:48:12 -05:00
Jonathan Helmus a47a700fe7 TST: Faster test_multi_image unit tests.
Unit tests in test_multi_image speed up by using a smaller gif file.

New file no_time_for_that_tiny.gif file created using:
gifsicle --resize 14x25 no_time_for_that.gif > no_time_for_that_tiny.gif
2015-07-11 12:35:03 -05:00
Josh Warner 3ce57f244b Merge pull request #1576 from belltailjp/fix-broken-link-to-daisy-implementation
DOC: Fix broken hyperlink to daisy code
2015-07-04 11:38:37 -05:00
Josh Warner 17a1121e42 Merge pull request #595 from TimSC/fasthog
ENH: Fast, Cython based hog implementation
2015-07-04 10:49:56 -05:00
Daichi SUZUO 55f798109c Fix a broken link to daisy code 2015-07-04 18:39:02 +09:00
Juan Nunez-Iglesias 0c58501dc7 Merge pull request #1572 from csachs/cython_skeletonize
fast Cython based skeletonize implementation
2015-07-01 19:05:04 +10:00
Josh Warner 360892c9de Merge pull request #1553 from blink1073/tifffile-package
FIX: Use files from tifffile 0.6.2 package
2015-06-30 16:22:46 -05:00
Christian Sachs 639a046611 fixed intra docstring reference links 2015-06-30 16:33:03 +02:00
Christian Sachs 2de03d018a reordered code according to PEP8, modified docstring 2015-06-30 15:07:04 +02:00
Christian Sachs f54c254421 fixed docstrings, renamed variables for clarity, removed old skeletonize function body 2015-06-30 09:39:25 +02:00
Christian Sachs 5301a9a8e3 added faster, Cython based skeletonize function 2015-06-29 22:11:22 +02:00
Juan Nunez-Iglesias 6d63b80bb2 Merge pull request #1524 from bennlich/faster-skimage-draw-ellipse
skimage.draw.ellipse speedups
2015-06-26 16:29:03 +10:00
Juan Nunez-Iglesias 9923aaddb0 Merge pull request #1568 from sciunto/threshold_li_fix
attempt to fix #1567 (threshold_li should not modify the input image)
2015-06-26 01:24:27 +10:00
François Boulogne 6f1e84de95 attempt to fix #1567
add asseert_ND=2 to all threshold functions

Simpler writing, less cases

Fix variable name
2015-06-25 05:11:21 -04:00
bennlich 23670b4f02 Explicitly cast upper_left and lower_right to ints 2015-06-24 08:46:57 -07:00
Steven Silvester f442fe231a Allow plot plugin to have tools 2015-06-20 06:51:39 -05:00
Ivo Flipse cd30e010d5 Also added a nogil context manager to hoghistograms 2015-06-19 16:01:52 +02:00
Ivo Flipse 691beaa59f Adding nogil to cell_hog 2015-06-19 15:49:48 +02:00
Ivo Flipse 51e683f665 I hadn't realized I was reusing cc in the loop, so it would crash after one iteration.
And I had changed the second orientation, which probably wasn't correct
2015-06-19 08:51:54 +02:00
Ivo Flipse 167c8eeeb6 I hadn't realized when I changed orientations to an array, that its actually just an int and the original code said range(orientations), so I changed it to np.arange(orientations). Hopefully the tests will now pass again 2015-06-18 22:08:34 +02:00
Ivo Flipse 2500c21b12 Converted orientation and magnitude to typed memory view. Also changed gradient_columns and gradient_rows, hopefully in the right way. 2015-06-18 22:07:28 +02:00
Ivo Flipse 3d85503472 Renamed x to rows and y to columns, though I might have still missed it in some spots.
Indented the long if statements and put continue on a new line
Precomputed the range start and stop values
Defined additional variables
2015-06-18 22:03:21 +02:00
Ivo Flipse bea9886a12 I noticed that cy+cy and cx+cx was repeated in the inner-most loop as well 2015-06-18 22:01:44 +02:00