Commit Graph

4526 Commits

Author SHA1 Message Date
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
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
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
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
Steven Silvester b980e7bb98 Use files from tifffile 0.6.2 package
Use files from tifffile 0.6.0 package

Skip failing doctests

Skip failing doctests

Fix doctest skipping

Skip another doctest

Skip another doctest

Bump to tifffile 0.6.1 and add test

Use latest tifffile

Sync with 0.6.2

Skip doctests

Skip one more doctest

Another doctest skip

Use relative import in test

Fix import and failing doctest
2015-06-18 12:41:06 -05:00
Josh Warner 7a2b0a70f5 Merge pull request #1459 from vighneshbirodkar/seam_carving
FEAT: Seam Carving
2015-06-18 12:32:19 -05:00
Ivo Flipse ded652c2ab Moved more computations out of loops and added division from future 2015-06-18 18:55:32 +02:00
Ivo Flipse f633262f03 Moved more variables out of the loops and modified the docstring 2015-06-18 18:50:34 +02:00
Ivo Flipse 9c141eadf8 Extracted row_index and cell_row from the inner loop
Defined constants that don't have to be recomputed several times
2015-06-18 18:45:29 +02:00
Ivo Flipse 1b9a15a4d4 Made the indents line up with the ( 2015-06-18 18:38:59 +02:00
Josh Warner 91f74fd6c6 Merge pull request #1536 from warmspringwinds/mb-lbp
FEAT: multi-block local binary patterns (MB-LBP)
2015-06-16 12:43:32 -05:00
Vighnesh Birodkar 85946c8eed Changed return type to bint and improved code comments 2015-06-16 19:48:14 +05:30
Korijn van Golen 03b7d638a7 Wrapped long lines according to pep8. 2015-06-16 09:57:49 +02:00
Korijn van Golen 605eac2e8c Renamed to use row/column naming convention. 2015-06-16 09:54:54 +02:00
Korijn van Golen 78cf5a0f9a Removed unused code. 2015-06-16 09:40:04 +02:00
Korijn van Golen 8ab6e63e75 Removed unused import, applied pep8 formatting and corrected a method call
that should have been refactored.
2015-06-16 09:36:02 +02:00
Ivo Flipse c37fc9ec20 Update _hog.py
Made hog_histograms snake case
2015-06-15 22:51:30 +02:00
Ivo Flipse 502377e9ce Update _hoghistogram.pyx
Made the function names PEP8 compatible and added another level of indentation.
I also tried renaming some things where I considered columns useful, but for example cells per row isn't entirely accurate. Any suggestions?
2015-06-15 22:49:20 +02:00
dan 88e3ac45fc Documentation correction. 2015-06-15 22:12:02 +02:00
dan c3e23b0604 Changed x/y to r/c notation. Documentation correction. 2015-06-15 22:04:09 +02:00
Vighnesh Birodkar fee667b35c preallocated seam_buffer and added noil 2015-06-15 20:49:26 +05:30
Vighnesh Birodkar e247e3bacc Precomputation optimizations and docstring changes 2015-06-15 20:19:52 +05:30
Korijn van Golen ecdf71d14d Switched to memory view syntax. 2015-06-15 15:41:18 +02:00
Korijn van Golen aedf63f1f7 Switched to cnp where applicable. 2015-06-15 15:25:30 +02:00
Korijn van Golen 3719ff216c Updated docstrings. 2015-06-15 13:14:34 +02:00
Korijn van Golen c756d2d492 Partially fulfilled code review. 2015-06-15 11:49:21 +02:00