Commit Graph

7754 Commits

Author SHA1 Message Date
Juan Nunez-Iglesias d8cc148d8c Replace individual errors by 2D decorator 2015-12-24 19:00:43 +01:00
emmanuelle 0359284623 Modified some methods in _RegionProperties class to make them
dimension-agnostic. Removed the NotImplementedError for 3-D images in
regionprops function.
2015-12-24 18:56:49 +01:00
emmanuelle e1751f91e2 Some PEP8 in test module 2015-12-24 18:52:57 +01:00
Steven Silvester f3392bc4f5 Merge pull request #1848 from soupault/doc_edge_modes
DOC: plot_edge_modes improvement
2015-12-24 10:28:59 -06:00
Egor Panfilov 18a2747239 DOC: plot_edge_modes improvement, closes #1816 2015-12-24 18:17:28 +03:00
Emmanuelle Gouillart 98d2446594 Merge pull request #1806 from JDWarner/sphinx_formatting
STY: Fix formatting and use tight_layout in doc examples.
2015-12-24 10:47:31 +01:00
Emmanuelle Gouillart d4b3aeeed3 Merge pull request #1846 from arokem/hull-docs
DOC: Small one. The input to this one needs to be 2D.
2015-12-24 10:34:00 +01:00
Emmanuelle Gouillart 6740ef9849 Merge pull request #1842 from jni/1840
Specify 2D images in denoise bilateral docstring
2015-12-24 09:59:11 +01:00
Josh Warner (Mac) 9b9473c6a1 STY: Fix formatting and use tight_layout in doc examples. 2015-12-23 20:53:51 -05:00
arokem 9fb5f1333d TST: Test both functions(!). 2015-12-23 15:36:35 -08:00
Stefan van der Walt cc8c3b7687 Merge pull request #1847 from emmanuelle/remove_label_from_morphology
Remove deprecated label function from morphology module in preparation for 0.12 release
2015-12-23 15:01:46 -08:00
arokem 436d0e8ca3 TST: Test error handling in convex_hull, convex_hull_object.
Also, a few PEP8 fixes in both module and tests.
2015-12-23 14:57:44 -08:00
arokem 227211fec7 DOC: Small one. The input to this one needs to be 2D. 2015-12-23 14:24:52 -08:00
emmanuelle 0b61b8f46f Removed deprecated label function from morphology module in preparation
for 0.12 release.
2015-12-23 23:24:22 +01:00
Emmanuelle Gouillart 4a07a3c9ad Merge pull request #1810 from alexandrejaguar/master
Solving white space + improving code +PEP8
2015-12-23 23:14:32 +01:00
Emmanuelle Gouillart 4509338aac Merge pull request #1777 from stevendbrown/rp_intensity_check
Added label vs. intensity shape checking to regionprops
2015-12-23 22:34:59 +01:00
Johannes Schönberger c5f9fffaad Merge pull request #1844 from emmanuelle/fix_euler
Fix euler
2015-12-23 21:56:46 +01:00
Alexandre Fioravante de Siqueira af95784ac9 Solving white space + improving code +PEP8
Solving white space + Correcting code

Solving white spaces

Solving white spaces

Solving white spaces

Answering comments

Correcting silly mistakes

Solving white spaces

Trying again... now with Travis enabled
2015-12-23 18:20:57 -02:00
Emmanuelle Gouillart fb9fdec7db Merge pull request #1845 from grlee77/tv_weight_fix
Use appropriate weights in tv_denoise_chambolle
2015-12-23 19:53:51 +01:00
Gregory R. Lee 3f5aa73eb4 Update tests to also use reasonable weights for TV denoising 2015-12-23 12:30:12 -05:00
Gregory R. Lee f143f4b39e Change default weight for denoise_tv_chambolle to a value that is reasonable for float images scaled to the [0, 1] range 2015-12-23 12:29:37 -05:00
emmanuelle d62524f103 Mentioned Euler characteristic (instead of Euler number) in docstring of
regionprops.
2015-12-23 16:26:23 +01:00
emmanuelle a56c6071c2 Corrected bug in the computation of the Euler characteristic. 2015-12-23 16:09:13 +01:00
Emmanuelle Gouillart d6105a0fe4 Merge pull request #1782 from pratapvardhan/clncython
BUG: Buffer dtype mismatch, expected 'Py_ssize_t' but got 'long'
2015-12-23 15:35:05 +01:00
Juan Nunez-Iglesias e102011098 Specify 2D images in denoise bilateral docstring
Addresses #1840
2015-12-23 23:57:22 +11:00
Juan Nunez-Iglesias f46a7e05ae Merge pull request #1841 from blink1073/fix-matplotlib-2.6
Lower required matplotlib version on 2.6 Travis test
2015-12-23 23:54:06 +11:00
Steven Silvester 39e1bb9376 Lower required matplotlib version on 2.6 test 2015-12-23 05:54:21 -06:00
Emmanuelle Gouillart ea9ed9ccd9 Merge pull request #1826 from jni/rag-generic
Allow construction of simple RAGs from label images
2015-12-22 17:37:02 +01:00
Steven Silvester a4d0ac85cc Merge pull request #1603 from michaelpacer/draw_coords
Fixed variable names to accord with r, c naming convention
2015-12-21 12:11:16 -06:00
Steven Silvester d003f701a6 Merge pull request #1834 from emmanuelle/active_contour_example
Move active contour example to edges section of the gallery
2015-12-20 07:59:19 -06:00
emmanuelle 8758e2f9bb Moved active contours example in edges section 2015-12-20 10:09:59 +01:00
emmanuelle b68decad9e Thickened contours so that they are more visible in gallery thumbnail. 2015-12-20 10:08:31 +01:00
Emmanuelle Gouillart f0eec46e5c Merge pull request #1783 from ivoflipse/fix_hog
Fixing Cythonized version of HOG
2015-12-19 17:37:24 +01:00
Steven Silvester 9e3b87c092 Merge pull request #1823 from emmanuelle/structure-gallery
Added sections to gallery of examples
2015-12-19 10:13:17 -06:00
emmanuelle 55f5103dd8 Added sections to gallery of examples
Modified travis_script.sh to account for the new structure of the gallery

Added README.txt files in directories of gallery examples

Fixed references to gallery images in user guide pages

Fixed broken links
2015-12-19 15:28:15 +01:00
Juan Nunez-Iglesias 14095de291 Merge pull request #1830 from scottsievert/fftconvolve
Clean up richardson-lucy deconvolution function
2015-12-16 14:42:24 +11:00
Josh Warner 8f0c5ab4d6 Merge pull request #1790 from WarrenWeckesser/imread-indexed-png-alpha
FIX: imread w/PIL plugin no longer drops indexed PNG alpha channel
2015-12-15 19:57:23 -07:00
scottsievert fb99e3cce6 styles code (no more functions, less lines) 2015-12-15 19:19:14 -06:00
Juan Nunez-Iglesias 06186710d5 Update outdated docstring of _add_edge_filter 2015-12-16 08:31:30 +11:00
Warren Weckesser 3251d3c07a BLD: Increase the minimum pillow version to 2.1.0. 2015-12-15 12:30:43 -05:00
Warren Weckesser 6b908c1bb1 BUG: io: imread in the PIL plugin drops indexed PNG alpha channel.
When using the PIL plugin to read an indexed PNG file that has
an alpha channel, the alpha channel would be lost.
2015-12-15 12:30:43 -05:00
Juan Nunez-Iglesias 2f3bc7f08d Merge pull request #1828 from stefanv/radon_circle_warn
radon transform: ignore values outside circle
2015-12-15 12:57:55 +11:00
Stefan van der Walt 74a015d1d4 radon transform: when circle=True, ignore values outside circle without throwing an error (closes #1808) 2015-12-14 17:13:29 -08:00
Juan Nunez-Iglesias 5c03f2aff5 Bug: not all edges found by asymmetric footprint
If we have a label image:

[[1, 2],
 [3, 4]]

Then the footprint:

 [[0, 0, 0],
  [0, 1, 1],
  [0, 1, 1]]

will not discover the edge (2, 3), even though that edge should be
present when `connectivity=2`.

This commit fixes the bug by using a complete footprint, without the
top/left surfaces zeroed out.

See also:
https://github.com/scikit-image/scikit-image/pull/1826#issuecomment-164597442
2015-12-15 10:56:04 +11:00
Johannes Schönberger 86052d67bd Merge pull request #1815 from stefanv/regionprops_cached_decorator
Regionprops cached decorator
2015-12-14 15:12:39 -05:00
Stefan van der Walt 4aa08fe353 Simplify cache 2015-12-14 00:42:29 -08:00
Stefan van der Walt bf5ba4540b Fix doc setting for Python 2.x 2015-12-14 00:42:29 -08:00
Stefan van der Walt 024dd34b19 Clean up style and PEP8 2015-12-14 00:42:29 -08:00
Stefan van der Walt 5e848f5889 Auto-generate _RegionProps property docstrings 2015-12-14 00:42:29 -08:00
Juan Nunez-Iglesias 4deeb1f802 Move max_id logic to top of RAG constructor
max_id is used during RAG building iteration, resulting in an error if
it is not defined ahead of the generic_filter stage.
2015-12-14 19:06:43 +11:00