From dd9e7f3526671c8b05a89b76e14e81e79914cd04 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Tue, 2 Oct 2012 22:36:47 -0400 Subject: [PATCH 01/81] DOC: Save thumbnails with a fixed image shape A fixed shape improves grid alignment of images and caption in the gallery. --- doc/ext/plot2rst.py | 39 +++++++++++++++++++++++++++++++++------ 1 file changed, 33 insertions(+), 6 deletions(-) diff --git a/doc/ext/plot2rst.py b/doc/ext/plot2rst.py index 92978723..65c77521 100644 --- a/doc/ext/plot2rst.py +++ b/doc/ext/plot2rst.py @@ -27,9 +27,10 @@ plot2rst_rcparams : dict plot2rst_default_thumb : str Path (relative to doc root) of default thumbnail image. -plot2rst_thumb_scale : float - Scale factor for thumbnail (e.g., 0.2 to scale plot to 1/5th the - original size). +plot2rst_thumb_shape : float + Shape of thumbnail in pixels. The image is resized to fit within this shape + and the excess is filled with white pixels. This fixed size ensures that + that gallery images are displayed in a grid. plot2rst_plot_tag : str When this tag is found in the example file, the current plot is saved and @@ -73,7 +74,10 @@ import numpy as np import matplotlib matplotlib.use('Agg') import matplotlib.pyplot as plt -from matplotlib import image + +from skimage import io +from skimage import transform +from skimage.util.dtype import dtype_range LITERALINCLUDE = """ @@ -160,7 +164,7 @@ def setup(app): ('../examples', 'auto_examples'), True) app.add_config_value('plot2rst_rcparams', {}, True) app.add_config_value('plot2rst_default_thumb', None, True) - app.add_config_value('plot2rst_thumb_scale', 0.25, True) + app.add_config_value('plot2rst_thumb_shape', (250, 300), True) app.add_config_value('plot2rst_plot_tag', 'PLOT2RST.current_figure', True) app.add_config_value('plot2rst_index_name', 'index', True) @@ -335,7 +339,8 @@ def write_example(src_name, src_dir, rst_dir, cfg): thumb_path = thumb_dir.pjoin(src_name[:-3] + '.png') first_image_file = image_dir.pjoin(figure_list[0].lstrip('/')) if first_image_file.exists: - image.thumbnail(first_image_file, thumb_path, cfg.plot2rst_thumb_scale) + first_image = io.imread(first_image_file) + save_thumbnail(first_image, thumb_path, cfg.plot2rst_thumb_shape) if not thumb_path.exists: if cfg.plot2rst_default_thumb is None: @@ -345,6 +350,28 @@ def write_example(src_name, src_dir, rst_dir, cfg): shutil.copy(cfg.plot2rst_default_thumb, thumb_path) +def save_thumbnail(image, thumb_path, shape): + """Save image as a thumbnail with the specified shape. + + The image is first resized to fit within the specified shape and then + centered in an array of the specified shape before saving. + """ + rescale = min(float(w_1) / w_2 for w_1, w_2 in zip(shape, image.shape)) + small_shape = (rescale * np.asarray(image.shape[:2])).astype(int) + small_image = transform.resize(image, small_shape) + + if len(image.shape) == 3: + shape = shape + (image.shape[2],) + background_value = dtype_range[small_image.dtype.type][1] + thumb = background_value * np.ones(shape, dtype=small_image.dtype) + + i = (shape[0] - small_shape[0]) // 2 + j = (shape[1] - small_shape[1]) // 2 + thumb[i:i+small_shape[0], j:j+small_shape[1]] = small_image + + io.imsave(thumb_path, thumb) + + def _plots_are_current(src_path, image_path): first_image_file = Path(image_path.format(1)) needs_replot = (not first_image_file.exists or From 527e4b579d01374a9644e00f1ca0636829636d33 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Tue, 2 Oct 2012 23:42:14 -0400 Subject: [PATCH 02/81] DOC: Remove task list from docs Add link to new task list on github wiki. --- TASKS.txt | 110 +----------------------------------------------------- 1 file changed, 1 insertion(+), 109 deletions(-) diff --git a/TASKS.txt b/TASKS.txt index da715573..9a846be9 100644 --- a/TASKS.txt +++ b/TASKS.txt @@ -22,116 +22,8 @@ following challenges you'd like to solve. * Mentoring is available for those new to scientific programming in Python. * The technical detail of the `development process`_ is given below. * :doc:`How to use GitHub ` when developing skimage +* If you're looking something to implement, you can find a list of `requested features on github `__. In addition, you can browse the `open issues on github `__. .. contents:: :local: -Tasks ------ - -.. :doc:`gsoc2011` -.. :doc:`coverage_table` - -Implement Algorithms -```````````````````` -- Graph cut segmentation -- `Image colorization `__ -- Fast 2D convex hull (consider using CellProfiler version) - `Algorithm overview `__. - `One free implementation - `_. - [Compare against current implementation] -- Convex hulls of objects in a labels matrix (simply adapt current convex hull - image code--this one's low hanging fruit). Generalise this solution to also - skeletonize objects in a labels matrix. -- Add binary features (BRIEF, BRISK, FREAK) -- Add `STAR features `__ -- `Blurring kernel estimation `__ - -Drawing (directly on an ndarray) -```````````````````````````````` -- Wu's algorithm for circles -- Text rendering -- Add anti-aliasing - -Infrastructure --------------- -- Add @greyimage decorator to check if input is a greyscale image -- :strike:`Implement a new backend system so that we may start including - PyOpenCL-based algorithms` - -Adapt existing code for use -``````````````````````````` -These snippets and packages have already been written. Some need to be -modified to work as part of the scikit, others may be lacking in documentation -or tests. - - * :strike:`Connected components` - * Nadav's bilateral filtering (first compare against CellProfiler's - code, based on http://groups.csail.mit.edu/graphics/bilagrid/bilagrid_web.pdf) - Also see https://github.com/stefanv/scikits-image/tree/bilateral - * 2D image warping via thin-plate splines [ask Zach Pincus] - -Merge code provided by `CellProfiler `_ team -````````````````````````````````````````````````````````````````````````` -* Roberts filter - convolution with diagonal and anti-diagonal - kernels to detect edges -* Minimum enclosing circles of objects in a labels matrix -* spur removal, thinning, thickening, and other morphological operations on - binary images, framework for creating arbitrary morphological operations - using a 3x3 grid. - -Their SVN repository is read-accessible at - -- https://svn.broadinstitute.org/CellProfiler/trunk/CellProfiler/cellprofiler - -The files for the above algorithms are - -- https://svn.broadinstitute.org/CellProfiler/trunk/CellProfiler/cellprofiler/cpmath/cpmorphology.py -- https://svn.broadinstitute.org/CellProfiler/trunk/CellProfiler/cellprofiler/cpmath/filter.py - -There are test suites for the files at - -- https://svn.broadinstitute.org/CellProfiler/trunk/CellProfiler/cellprofiler/cpmath/tests/test_cpmorphology.py -- https://svn.broadinstitute.org/CellProfiler/trunk/CellProfiler/cellprofiler/cpmath/tests/test_filter.py - -Quoting a message from Lee Kamentsky to Stefan van der Walt sent on -5 August 2009:: - - We're part of the Broad Institute which is non-profit. We would be happy - to include our algorithm code in SciPy under the BSD license since that is - more appropriate for a library that might be integrated into a - commercial product whereas CellProfiler needs the more stringent - protection of GPL as an application. - -In 2010, Vebjorn Ljosa officially released parts of the code under a -BSD license (:doc:`cell_profiler` | `original message -`_). - -Thanks to Lee Kamentsky, Thouis Jones and Anne Carpenter and their colleagues -who contributed. - -Rework linear filters -````````````````````` -* Fast, SSE2 convolution (high priority) (see prototype in pull requests) -* Should take kernel or function for parameter (currently only takes function) -* Kernel shape should be specifiable (currently defaults to image shape) - -io -`` -* Update ``qt_plugin.py`` and other plugins to view collections. -* Rewrite GTK backend using GObject Introspection for Py3K compatibility. -* Add DICOM plugin for `GDCM `__. -* Add ``imread_collection`` to all ``imread`` backends -* Better video loading (move to plugin framework, add backends) - -viewer -`````` -* Using the visualization tools, add an FFT-domain image editor - -docs -```` -* Add examples to the gallery -* Write topics for the `user guide - `_ -* Integrate BiBTeX plugin into Sphinx build From 5e97f1f1ea0de611b09ffbe2b133cf4f72d683dd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 3 Oct 2012 20:01:00 +0200 Subject: [PATCH 03/81] Fix navigation docs link --- doc/source/_templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/_templates/navbar.html b/doc/source/_templates/navbar.html index b0fa8026..7ef84786 100644 --- a/doc/source/_templates/navbar.html +++ b/doc/source/_templates/navbar.html @@ -1,5 +1,5 @@
  • Home
  • Download
  • Gallery
    • -
  • Documentation
    • +
  • Documentation
  • Source
    • From c6cf768a9cc25c345110bb74eba98798b43bc108 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 3 Oct 2012 20:06:38 +0200 Subject: [PATCH 04/81] Extend CSS rule for all headings --- doc/source/themes/scikit-image/static/css/custom.css | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/doc/source/themes/scikit-image/static/css/custom.css b/doc/source/themes/scikit-image/static/css/custom.css index df60739e..85a174df 100644 --- a/doc/source/themes/scikit-image/static/css/custom.css +++ b/doc/source/themes/scikit-image/static/css/custom.css @@ -14,10 +14,9 @@ pre { font-size: 11px; } -h1, h2, h3, h4 { - clear: left; +h1, h2, h3, h4, h5, h6 { + clear: left; } - h1 { font-size: 30px; line-height: 36px; From 060d92fb576fce31423f2b1e3edf7e53d049503a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 3 Oct 2012 20:31:55 +0200 Subject: [PATCH 05/81] Fix navigation home page link --- doc/source/_templates/navbar.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/_templates/navbar.html b/doc/source/_templates/navbar.html index 7ef84786..267af8e7 100644 --- a/doc/source/_templates/navbar.html +++ b/doc/source/_templates/navbar.html @@ -1,4 +1,4 @@ -
  • Home
    • +
  • Home
  • Download
  • Gallery
  • Documentation
    • From 904803184526e69dad2c3b4044e03a6298cd87f1 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 3 Oct 2012 17:03:54 -0700 Subject: [PATCH 06/81] DOC: Credit Johannes for website layout. --- CONTRIBUTORS.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/CONTRIBUTORS.txt b/CONTRIBUTORS.txt index 5f18e821..c73b14e2 100644 --- a/CONTRIBUTORS.txt +++ b/CONTRIBUTORS.txt @@ -107,7 +107,7 @@ - Johannes Schönberger Drawing functions, adaptive thresholding, regionprops, geometric - transformations, LBPs, polygon approximations, and more. + transformations, LBPs, polygon approximations, web layout, and more. - Pavel Campr Fixes and tests for Histograms of Oriented Gradients. From 089f7ffda049395249e5e8057ad21bff8659063e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 4 Oct 2012 09:25:24 +0200 Subject: [PATCH 07/81] Change domain name --- doc/Makefile | 2 +- doc/release/release_0.3.txt | 4 ++-- doc/release/release_0.4.txt | 4 ++-- doc/release/release_0.5.txt | 2 +- doc/source/_static/docversions.js | 2 +- doc/source/gitwash/this_project.inc | 2 +- doc/source/overview.txt | 4 ++-- doc/source/random_gallery.py | 4 ++-- doc/source/themes/scikit-image/layout.html | 2 +- 9 files changed, 13 insertions(+), 13 deletions(-) diff --git a/doc/Makefile b/doc/Makefile index f750fb18..ea6e26e3 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -124,7 +124,7 @@ gh-pages: gitwash: python tools/gitwash/gitwash_dumper.py source scikit-image \ - --project-url=http://scikit-image.org \ + --project-url=http://skimage.org \ --project-ml-url=http://groups.google.com/group/scikit-image \ --repo-name=scikit-image \ --github-user=scikit-image \ diff --git a/doc/release/release_0.3.txt b/doc/release/release_0.3.txt index 617c3614..743e388d 100644 --- a/doc/release/release_0.3.txt +++ b/doc/release/release_0.3.txt @@ -9,11 +9,11 @@ Python (>=2.6 or 3.x), NumPy and SciPy can be installed. For more information, visit our website - http://scikit-image.org + http://skimage.org or the examples gallery at - http://scikit-image.org/docs/0.3/auto_examples/ + http://skimage.org/docs/0.3/auto_examples/ New Features ------------ diff --git a/doc/release/release_0.4.txt b/doc/release/release_0.4.txt index 04679271..2e8092dd 100644 --- a/doc/release/release_0.4.txt +++ b/doc/release/release_0.4.txt @@ -6,7 +6,7 @@ toolbox for SciPy. Please visit our examples gallery to see what we've been up to: - http://scikit-image.org/docs/0.4/auto_examples/ + http://skimage.org/docs/0.4/auto_examples/ Note that, in this release, we renamed the module from ``scikits.image`` to ``skimage``, to work around name space conflicts with other scikits (similarly, @@ -20,7 +20,7 @@ This release runs under all major operating systems where Python (>=2.6 or For more information, visit our website - http://scikit-image.org + http://skimage.org New Features ------------ diff --git a/doc/release/release_0.5.txt b/doc/release/release_0.5.txt index 652f45fa..4977046a 100644 --- a/doc/release/release_0.5.txt +++ b/doc/release/release_0.5.txt @@ -6,7 +6,7 @@ toolbox for SciPy. For more information, please visit our website - http://scikit-image.org + http://skimage.org New Features ------------ diff --git a/doc/source/_static/docversions.js b/doc/source/_static/docversions.js index 660553e0..7fbc57a0 100644 --- a/doc/source/_static/docversions.js +++ b/doc/source/_static/docversions.js @@ -12,6 +12,6 @@ function insert_version_links() { document.write(open_list); document.write('skimage VERSION \n' .replace('VERSION', labels[i]) - .replace('URL', 'http://scikit-image.org/docs/' + labels[i])); + .replace('URL', 'http://skimage.org/docs/' + labels[i])); } } diff --git a/doc/source/gitwash/this_project.inc b/doc/source/gitwash/this_project.inc index 349b92ba..6010831f 100644 --- a/doc/source/gitwash/this_project.inc +++ b/doc/source/gitwash/this_project.inc @@ -1,5 +1,5 @@ .. scikit-image -.. _scikit-image: http://scikit-image.org +.. _scikit-image: http://skimage.org .. _`scikit-image github`: http://github.com/scikit-image/scikit-image .. _`scikit-image mailing list`: http://groups.google.com/group/scikit-image diff --git a/doc/source/overview.txt b/doc/source/overview.txt index 5a4e6123..3acdeebf 100644 --- a/doc/source/overview.txt +++ b/doc/source/overview.txt @@ -1,7 +1,7 @@ Image Processing SciKit ======================= -The `scikit-image `__ SciKit (toolkit for +The `scikit-image `__ SciKit (toolkit for `SciPy `__) extends ``scipy.ndimage`` to provide a versatile set of image processing routines. It is written in the `Python `_ language. @@ -12,7 +12,7 @@ mailing list (address provided below). Homepage -------- -http://scikit-image.org +http://skimage.org Source, bugs and patches ------------------------ diff --git a/doc/source/random_gallery.py b/doc/source/random_gallery.py index 47ce89a2..3358b3f0 100644 --- a/doc/source/random_gallery.py +++ b/doc/source/random_gallery.py @@ -32,8 +32,8 @@ gallery_div = '''\ examples = glob.glob(os.path.join(example_dir, 'plot_*.py')) images, links = [], [] -image_url = 'http://scikit-image.org/docs/dev/_images/%s.png' -link_url = 'http://scikit-image.org/docs/dev/auto_examples/%s.html' +image_url = 'http://skimage.org/docs/dev/_images/%s.png' +link_url = 'http://skimage.org/docs/dev/auto_examples/%s.html' for e in examples: e = os.path.basename(e) diff --git a/doc/source/themes/scikit-image/layout.html b/doc/source/themes/scikit-image/layout.html index 58424f2f..a1755670 100644 --- a/doc/source/themes/scikit-image/layout.html +++ b/doc/source/themes/scikit-image/layout.html @@ -79,7 +79,7 @@ {%- block extrahead %}{% endblock %} - +
    From 1494bc56008f50f24d9046f7713b27a250b54eeb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 4 Oct 2012 09:29:00 +0200 Subject: [PATCH 08/81] Remove unused fopenmp compile args --- skimage/transform/setup.py | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/skimage/transform/setup.py b/skimage/transform/setup.py index cd2a0f8a..0e415bad 100644 --- a/skimage/transform/setup.py +++ b/skimage/transform/setup.py @@ -20,9 +20,7 @@ def configuration(parent_package='', top_path=None): include_dirs=[get_numpy_include_dirs()]) config.add_extension('_warps_cy', sources=['_warps_cy.c'], - include_dirs=[get_numpy_include_dirs(), '../_shared'], - extra_compile_args=['-fopenmp'], - extra_link_args=['-fopenmp']) + include_dirs=[get_numpy_include_dirs(), '../_shared']) return config From 70a509b626523d93a9e48a4a4a5b856361441c7a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 4 Oct 2012 10:19:07 +0200 Subject: [PATCH 09/81] Revert changes to release notes --- doc/release/release_0.3.txt | 4 ++-- doc/release/release_0.4.txt | 10 +++++----- doc/release/release_0.5.txt | 6 +++--- doc/release/release_0.6.txt | 6 +++--- doc/release/release_0.7.txt | 8 ++++---- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/doc/release/release_0.3.txt b/doc/release/release_0.3.txt index 743e388d..5446003d 100644 --- a/doc/release/release_0.3.txt +++ b/doc/release/release_0.3.txt @@ -9,11 +9,11 @@ Python (>=2.6 or 3.x), NumPy and SciPy can be installed. For more information, visit our website - http://skimage.org + http://scikits-image.org or the examples gallery at - http://skimage.org/docs/0.3/auto_examples/ + http://scikits-image.org/docs/0.3/auto_examples/ New Features ------------ diff --git a/doc/release/release_0.4.txt b/doc/release/release_0.4.txt index 2e8092dd..765b4760 100644 --- a/doc/release/release_0.4.txt +++ b/doc/release/release_0.4.txt @@ -1,26 +1,26 @@ -Announcement: scikit-image 0.4 +Announcement: scikits-image 0.4 =============================== -We're happy to announce the 0.4 release of scikit-image, an image processing +We're happy to announce the 0.4 release of scikits-image, an image processing toolbox for SciPy. Please visit our examples gallery to see what we've been up to: - http://skimage.org/docs/0.4/auto_examples/ + http://scikits-image.org/docs/0.4/auto_examples/ Note that, in this release, we renamed the module from ``scikits.image`` to ``skimage``, to work around name space conflicts with other scikits (similarly, the machine learning scikit is now imported as ``sklearn``). A big shout-out also to everyone currently at SciPy India; have fun, and -remember to join the scikit-image sprint! +remember to join the scikits-image sprint! This release runs under all major operating systems where Python (>=2.6 or 3.x), NumPy and SciPy can be installed. For more information, visit our website - http://skimage.org + http://scikits-image.org New Features ------------ diff --git a/doc/release/release_0.5.txt b/doc/release/release_0.5.txt index 4977046a..74a5b3fe 100644 --- a/doc/release/release_0.5.txt +++ b/doc/release/release_0.5.txt @@ -1,12 +1,12 @@ -Announcement: scikit-image 0.5 +Announcement: scikits-image 0.5 =============================== -We're happy to announce the 0.5 release of scikit-image, our image processing +We're happy to announce the 0.5 release of scikits-image, our image processing toolbox for SciPy. For more information, please visit our website - http://skimage.org + http://scikits-image.org New Features ------------ diff --git a/doc/release/release_0.6.txt b/doc/release/release_0.6.txt index df2582cc..8c525cb7 100644 --- a/doc/release/release_0.6.txt +++ b/doc/release/release_0.6.txt @@ -1,9 +1,9 @@ -Announcement: scikit-image 0.6 +Announcement: scikits-image 0.6 =============================== -We're happy to announce the 6th version of scikit-image! +We're happy to announce the 6th version of scikits-image! -scikit-image is an image processing toolbox for SciPy that includes algorithms +Scikits-image is an image processing toolbox for SciPy that includes algorithms for segmentation, geometric transformations, color space manipulation, analysis, filtering, morphology, feature detection, and more. diff --git a/doc/release/release_0.7.txt b/doc/release/release_0.7.txt index 6637cd51..a6b591cb 100644 --- a/doc/release/release_0.7.txt +++ b/doc/release/release_0.7.txt @@ -1,9 +1,9 @@ -Announcement: scikit-image 0.7.0 +Announcement: scikits-image 0.7.0 ================================= -We're happy to announce the 7th version of scikit-image! +We're happy to announce the 7th version of scikits-image! -scikit-image is an image processing toolbox for SciPy that includes algorithms +Scikits-image is an image processing toolbox for SciPy that includes algorithms for segmentation, geometric transformations, color space manipulation, analysis, filtering, morphology, feature detection, and more. @@ -15,7 +15,7 @@ For more information, examples, and documentation, please visit our website New Features ------------ -It's been only 3 months since scikit-image 0.6 was released, but in that short +It's been only 3 months since scikits-image 0.6 was released, but in that short time, we've managed to add plenty of new features and enhancements, including - Geometric image transforms From 98b18da2abb184b8ea48240c08607fa0f0526282 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 4 Oct 2012 10:24:41 +0200 Subject: [PATCH 10/81] Add favicon for docs --- .../themes/scikit-image/static/img/favicon.ico | Bin 0 -> 10134 bytes 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 doc/source/themes/scikit-image/static/img/favicon.ico diff --git a/doc/source/themes/scikit-image/static/img/favicon.ico b/doc/source/themes/scikit-image/static/img/favicon.ico new file mode 100644 index 0000000000000000000000000000000000000000..d7ae6012a5e3d0ddb7865dfad0acd5382b2edcd7 GIT binary patch literal 10134 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 Date: Fri, 5 Oct 2012 06:18:58 +0200 Subject: [PATCH 11/81] Add function to scale images --- skimage/transform/__init__.py | 2 +- skimage/transform/_warps.py | 43 +++++++++++++++++++++++++++ skimage/transform/tests/test_warps.py | 11 ++++++- 3 files changed, 54 insertions(+), 2 deletions(-) diff --git a/skimage/transform/__init__.py b/skimage/transform/__init__.py index a55d5df4..3185bf1d 100644 --- a/skimage/transform/__init__.py +++ b/skimage/transform/__init__.py @@ -6,6 +6,6 @@ from ._geometric import (warp, warp_coords, estimate_transform, SimilarityTransform, AffineTransform, ProjectiveTransform, PolynomialTransform, PiecewiseAffineTransform) -from ._warps import swirl, homography, resize, rotate +from ._warps import swirl, homography, resize, rotate, scale from .pyramids import (pyramid_reduce, pyramid_expand, pyramid_gaussian, pyramid_laplacian) diff --git a/skimage/transform/_warps.py b/skimage/transform/_warps.py index 72f90050..2c508763 100644 --- a/skimage/transform/_warps.py +++ b/skimage/transform/_warps.py @@ -52,6 +52,49 @@ def resize(image, output_shape, order=1, mode='constant', cval=0.): mode=mode, cval=cval) +def scale(image, scale, order=1, mode='constant', cval=0.): + """Scale image. + + Parameters + ---------- + image : ndarray + Input image. + scale : {float, tuple of floats} + Scale factors. Separate scale factors can be defined as + `(row_scale, col_scale)`. + + Returns + ------- + scaled : ndarray + Scaled version of the input. + + Other parameters + ---------------- + order : int + Order of splines used in interpolation. See + `scipy.ndimage.map_coordinates` for detail. + mode : string + How to handle values outside the image borders. See + `scipy.ndimage.map_coordinates` for detail. + cval : string + Used in conjunction with mode 'constant', the value outside + the image boundaries. + + """ + + try: + rscale, cscale = scale + except TypeError: + rscale = cscale = scale + + orig_rows, orig_cols = image.shape[0], image.shape[1] + rows = np.round(rscale * orig_rows) + cols = np.round(cscale * orig_cols) + output_shape = (rows, cols) + + return resize(image, output_shape, order=order, mode=mode, cval=cval) + + def rotate(image, angle, resize=False, order=1, mode='constant', cval=0.): """Rotate image by a certain angle around its center. diff --git a/skimage/transform/tests/test_warps.py b/skimage/transform/tests/test_warps.py index b705ac47..e0a768e8 100644 --- a/skimage/transform/tests/test_warps.py +++ b/skimage/transform/tests/test_warps.py @@ -2,7 +2,7 @@ from numpy.testing import assert_array_almost_equal, run_module_suite import numpy as np from scipy.ndimage import map_coordinates -from skimage.transform import (warp, warp_coords, rotate, resize, +from skimage.transform import (warp, warp_coords, rotate, resize, scale, AffineTransform, ProjectiveTransform, SimilarityTransform, homography) @@ -94,6 +94,15 @@ def test_resize(): assert_array_almost_equal(resized, ref) +def test_scale(): + x = np.zeros((5, 5), dtype=np.double) + x[1, 1] = 1 + scaled = scale(x, 2, order=0) + ref = np.zeros((10, 10)) + ref[2:4, 2:4] = 1 + assert_array_almost_equal(scaled, ref) + + def test_swirl(): image = img_as_float(data.checkerboard()) From 8ca068ed19fe2808a13e9cc5973ef8b31564e666 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 5 Oct 2012 06:21:28 +0200 Subject: [PATCH 12/81] Add test case for separate scale factors --- skimage/transform/tests/test_warps.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/skimage/transform/tests/test_warps.py b/skimage/transform/tests/test_warps.py index e0a768e8..51a62e55 100644 --- a/skimage/transform/tests/test_warps.py +++ b/skimage/transform/tests/test_warps.py @@ -95,6 +95,7 @@ def test_resize(): def test_scale(): + # same scale factor x = np.zeros((5, 5), dtype=np.double) x[1, 1] = 1 scaled = scale(x, 2, order=0) @@ -102,6 +103,14 @@ def test_scale(): ref[2:4, 2:4] = 1 assert_array_almost_equal(scaled, ref) + # different scale factors + x = np.zeros((5, 5), dtype=np.double) + x[1, 1] = 1 + scaled = scale(x, (2, 1), order=0) + ref = np.zeros((10, 5)) + ref[2:4, 1] = 1 + assert_array_almost_equal(scaled, ref) + def test_swirl(): image = img_as_float(data.checkerboard()) From 17c7d10918c742496c53d35a9c022a260091c057 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 5 Oct 2012 10:05:06 +0200 Subject: [PATCH 13/81] Rename scale function to rescale and scale variables --- skimage/transform/__init__.py | 2 +- skimage/transform/_warps.py | 18 +++++++++--------- skimage/transform/tests/test_warps.py | 6 +++--- 3 files changed, 13 insertions(+), 13 deletions(-) diff --git a/skimage/transform/__init__.py b/skimage/transform/__init__.py index 3185bf1d..befcc23f 100644 --- a/skimage/transform/__init__.py +++ b/skimage/transform/__init__.py @@ -6,6 +6,6 @@ from ._geometric import (warp, warp_coords, estimate_transform, SimilarityTransform, AffineTransform, ProjectiveTransform, PolynomialTransform, PiecewiseAffineTransform) -from ._warps import swirl, homography, resize, rotate, scale +from ._warps import swirl, homography, resize, rotate, rescale from .pyramids import (pyramid_reduce, pyramid_expand, pyramid_gaussian, pyramid_laplacian) diff --git a/skimage/transform/_warps.py b/skimage/transform/_warps.py index 2c508763..c64998fc 100644 --- a/skimage/transform/_warps.py +++ b/skimage/transform/_warps.py @@ -35,15 +35,15 @@ def resize(image, output_shape, order=1, mode='constant', cval=0.): rows, cols = output_shape orig_rows, orig_cols = image.shape[0], image.shape[1] - rscale = float(orig_rows) / rows - cscale = float(orig_cols) / cols + row_scale = float(orig_rows) / rows + col_scale = float(orig_cols) / cols # 3 control points necessary to estimate exact AffineTransform src_corners = np.array([[1, 1], [1, rows], [cols, rows]]) - 1 dst_corners = np.zeros(src_corners.shape, dtype=np.double) # take into account that 0th pixel is at position (0.5, 0.5) - dst_corners[:, 0] = cscale * (src_corners[:, 0] + 0.5) - 0.5 - dst_corners[:, 1] = rscale * (src_corners[:, 1] + 0.5) - 0.5 + dst_corners[:, 0] = col_scale * (src_corners[:, 0] + 0.5) - 0.5 + dst_corners[:, 1] = row_scale * (src_corners[:, 1] + 0.5) - 0.5 tform = AffineTransform() tform.estimate(src_corners, dst_corners) @@ -52,7 +52,7 @@ def resize(image, output_shape, order=1, mode='constant', cval=0.): mode=mode, cval=cval) -def scale(image, scale, order=1, mode='constant', cval=0.): +def rescale(image, scale, order=1, mode='constant', cval=0.): """Scale image. Parameters @@ -83,13 +83,13 @@ def scale(image, scale, order=1, mode='constant', cval=0.): """ try: - rscale, cscale = scale + row_scale, col_scale = scale except TypeError: - rscale = cscale = scale + row_scale = col_scale = scale orig_rows, orig_cols = image.shape[0], image.shape[1] - rows = np.round(rscale * orig_rows) - cols = np.round(cscale * orig_cols) + rows = np.round(row_scale * orig_rows) + cols = np.round(col_scale * orig_cols) output_shape = (rows, cols) return resize(image, output_shape, order=order, mode=mode, cval=cval) diff --git a/skimage/transform/tests/test_warps.py b/skimage/transform/tests/test_warps.py index 51a62e55..69980b25 100644 --- a/skimage/transform/tests/test_warps.py +++ b/skimage/transform/tests/test_warps.py @@ -2,7 +2,7 @@ from numpy.testing import assert_array_almost_equal, run_module_suite import numpy as np from scipy.ndimage import map_coordinates -from skimage.transform import (warp, warp_coords, rotate, resize, scale, +from skimage.transform import (warp, warp_coords, rotate, resize, rescale, AffineTransform, ProjectiveTransform, SimilarityTransform, homography) @@ -98,7 +98,7 @@ def test_scale(): # same scale factor x = np.zeros((5, 5), dtype=np.double) x[1, 1] = 1 - scaled = scale(x, 2, order=0) + scaled = rescale(x, 2, order=0) ref = np.zeros((10, 10)) ref[2:4, 2:4] = 1 assert_array_almost_equal(scaled, ref) @@ -106,7 +106,7 @@ def test_scale(): # different scale factors x = np.zeros((5, 5), dtype=np.double) x[1, 1] = 1 - scaled = scale(x, (2, 1), order=0) + scaled = rescale(x, (2, 1), order=0) ref = np.zeros((10, 5)) ref[2:4, 1] = 1 assert_array_almost_equal(scaled, ref) From 1fa4bd3d9bcd02687d068946c1c97cae538cf2ce Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 5 Oct 2012 10:05:37 +0200 Subject: [PATCH 14/81] Enhance short description of resize and rescale functions --- skimage/transform/_warps.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/transform/_warps.py b/skimage/transform/_warps.py index c64998fc..71bc41b8 100644 --- a/skimage/transform/_warps.py +++ b/skimage/transform/_warps.py @@ -4,7 +4,7 @@ from ._geometric import (warp, SimilarityTransform, AffineTransform, def resize(image, output_shape, order=1, mode='constant', cval=0.): - """Resize image. + """Resize image to match a certain size. Parameters ---------- @@ -53,7 +53,7 @@ def resize(image, output_shape, order=1, mode='constant', cval=0.): def rescale(image, scale, order=1, mode='constant', cval=0.): - """Scale image. + """Scale image by a certain factor. Parameters ---------- From 37e8345dc86778b29c75352ad68e4e4fa6902d66 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 5 Oct 2012 10:13:25 +0200 Subject: [PATCH 15/81] Fix doc version 0.7 link --- doc/source/_static/docversions.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/source/_static/docversions.js b/doc/source/_static/docversions.js index 7fbc57a0..ff910c3f 100644 --- a/doc/source/_static/docversions.js +++ b/doc/source/_static/docversions.js @@ -1,5 +1,5 @@ function insert_version_links() { - var labels = ['dev', '0.7', '0.6', '0.5', '0.4', '0.3']; + var labels = ['dev', '0.7.0', '0.6', '0.5', '0.4', '0.3']; for (i = 0; i < labels.length; i++){ open_list = '
  • ' From 76f5156168dc5b7715380fa08917964cad38d5f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 15:21:26 +0200 Subject: [PATCH 16/81] Fix bug in warp which caused 1 pixel images not to be clipped --- skimage/transform/_geometric.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/skimage/transform/_geometric.py b/skimage/transform/_geometric.py index 6e04a271..1179811d 100644 --- a/skimage/transform/_geometric.py +++ b/skimage/transform/_geometric.py @@ -1015,7 +1015,8 @@ def warp(image, inverse_map=None, map_args={}, output_shape=None, order=1, if mode == 'constant' and not (0 <= cval <= 1): clipped[out == cval] = cval - if clipped.shape[0] == 1 or clipped.shape[1] == 1: + if clipped.ndim == 3 and orig_ndim == 2: + # remove singleton dim introduced by atleast_3d + return clipped[..., 0] + else: return clipped - else: # remove singleton dim introduced by atleast_3d - return clipped.squeeze() From 661d50ee205b3eed4728002c1e1d0bba8ad34383 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 15:23:23 +0200 Subject: [PATCH 17/81] Full test coverage for image pyramids --- skimage/transform/tests/test_pyramids.py | 49 +++++++++++++++++++----- 1 file changed, 40 insertions(+), 9 deletions(-) diff --git a/skimage/transform/tests/test_pyramids.py b/skimage/transform/tests/test_pyramids.py index 611ecdec..dd976a7b 100644 --- a/skimage/transform/tests/test_pyramids.py +++ b/skimage/transform/tests/test_pyramids.py @@ -1,41 +1,72 @@ -from numpy.testing import assert_array_equal, run_module_suite +from numpy.testing import assert_array_equal, assert_raises, run_module_suite from skimage import data -from skimage.transform import (pyramid_reduce, pyramid_expand, - pyramid_gaussian, pyramid_laplacian) +from skimage.transform import pyramids image = data.lena() +image_gray = image[..., 0] def test_pyramid_reduce(): + # RGB image rows, cols, dim = image.shape - out = pyramid_reduce(image, downscale=2) + out = pyramids.pyramid_reduce(image, downscale=2) assert_array_equal(out.shape, (rows / 2, cols / 2, dim)) + # grayscale image + rows, cols = image_gray.shape + out = pyramids.pyramid_reduce(image_gray, downscale=2) + assert_array_equal(out.shape, (rows / 2, cols / 2)) + def test_pyramid_expand(): + # RGB image rows, cols, dim = image.shape - out = pyramid_expand(image, upscale=2) + out = pyramids.pyramid_expand(image, upscale=2) assert_array_equal(out.shape, (rows * 2, cols * 2, dim)) + # grayscale image + rows, cols = image_gray.shape + out = pyramids.pyramid_expand(image_gray, upscale=2) + assert_array_equal(out.shape, (rows * 2, cols * 2)) + def test_build_gaussian_pyramid(): + # RGB image rows, cols, dim = image.shape - pyramid = pyramid_gaussian(image, downscale=2) - + pyramid = pyramids.pyramid_gaussian(image, downscale=2) for layer, out in enumerate(pyramid): layer_shape = (rows / 2 ** layer, cols / 2 ** layer, dim) assert_array_equal(out.shape, layer_shape) + # grayscale image + rows, cols = image_gray.shape + pyramid = pyramids.pyramid_gaussian(image_gray, downscale=2) + for layer, out in enumerate(pyramid): + layer_shape = (rows / 2 ** layer, cols / 2 ** layer) + assert_array_equal(out.shape, layer_shape) + def test_build_laplacian_pyramid(): + # RGB image rows, cols, dim = image.shape - pyramid = pyramid_laplacian(image, downscale=2) - + pyramid = pyramids.pyramid_laplacian(image, downscale=2) for layer, out in enumerate(pyramid): layer_shape = (rows / 2 ** layer, cols / 2 ** layer, dim) assert_array_equal(out.shape, layer_shape) + # grayscale image + rows, cols = image_gray.shape + pyramid = pyramids.pyramid_laplacian(image_gray, downscale=2) + for layer, out in enumerate(pyramid): + layer_shape = (rows / 2 ** layer, cols / 2 ** layer) + assert_array_equal(out.shape, layer_shape) + + +def test_check_factor(): + assert_raises(ValueError, pyramids._check_factor, 0.99) + assert_raises(ValueError, pyramids._check_factor, - 2) + if __name__ == "__main__": run_module_suite() From 59d3d842be3ae6082cc894300283cfcf6afde727 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 17:43:20 +0200 Subject: [PATCH 18/81] Full test coveragem for data package --- skimage/data/tests/test_data.py | 18 +++++++++++++++++- 1 file changed, 17 insertions(+), 1 deletion(-) diff --git a/skimage/data/tests/test_data.py b/skimage/data/tests/test_data.py index 1d85802b..b5f6bcaa 100644 --- a/skimage/data/tests/test_data.py +++ b/skimage/data/tests/test_data.py @@ -15,9 +15,25 @@ def test_camera(): def test_checkerboard(): - """ Test that checkerboard image can be loaded. """ + """ Test that "checkerboard" image can be loaded. """ data.checkerboard() + +def test_text(): + """ Test that "text" image can be loaded. """ + data.text() + + +def test_moon(): + """ Test that "moon" image can be loaded. """ + data.moon() + + +def test_page(): + """ Test that "page" image can be loaded. """ + data.page() + + if __name__ == "__main__": from numpy.testing import run_module_suite run_module_suite() From 01df23a67d7aedd0ee503c926b1ba8009dbd2278 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 17:47:54 +0200 Subject: [PATCH 19/81] Full test coverage for canny filter --- skimage/filter/tests/test_canny.py | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/skimage/filter/tests/test_canny.py b/skimage/filter/tests/test_canny.py index 1e406008..2c758edf 100644 --- a/skimage/filter/tests/test_canny.py +++ b/skimage/filter/tests/test_canny.py @@ -61,3 +61,8 @@ class TestCanny(unittest.TestCase): def test_image_shape(self): self.assertRaises(TypeError, F.canny, np.zeros((20, 20, 20)), 4, 0, 0) + + def test_mask_none(self): + result1 = F.canny(np.zeros((20, 20)), 4, 0, 0, np.ones((20, 20), bool)) + result2 = F.canny(np.zeros((20, 20)), 4, 0, 0) + self.assertTrue(np.all(result1 == result2)) From bca962cc8ad765d0e3b8bd97ddd1b025dc827735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 17:59:55 +0200 Subject: [PATCH 20/81] Improve test coverage for ctmf --- skimage/filter/tests/test_ctmf.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/skimage/filter/tests/test_ctmf.py b/skimage/filter/tests/test_ctmf.py index fd820469..c4f6d10e 100644 --- a/skimage/filter/tests/test_ctmf.py +++ b/skimage/filter/tests/test_ctmf.py @@ -117,5 +117,11 @@ def test_insufficient_size(): median_filter(img, radius=1) +@raises(TypeError) +def test_wrong_shape(): + img = np.empty((10, 10, 3)) + median_filter(img) + + if __name__ == "__main__": np.testing.run_module_suite() From fad2813dd8e6fb50e6552a5fbadf1b5e9635f267 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 18:01:40 +0200 Subject: [PATCH 21/81] Fix callable test in LPI filter --- skimage/filter/lpi_filter.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/filter/lpi_filter.py b/skimage/filter/lpi_filter.py index 3826f5e7..2af74d7a 100644 --- a/skimage/filter/lpi_filter.py +++ b/skimage/filter/lpi_filter.py @@ -75,7 +75,7 @@ class LPIFilter2D(object): >>> filter = LPIFilter2D(filt_func) """ - if impulse_response is None: + if not callable(impulse_response): raise ValueError("Impulse response must be a callable.") self.impulse_response = impulse_response From 00dbb5e4e3017514f41ecbd40b00cfc53ec11916 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 18:36:15 +0200 Subject: [PATCH 22/81] Improve test coverage of LPI filter --- skimage/filter/tests/test_lpi_filter.py | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/skimage/filter/tests/test_lpi_filter.py b/skimage/filter/tests/test_lpi_filter.py index 08e46a58..f6176691 100644 --- a/skimage/filter/tests/test_lpi_filter.py +++ b/skimage/filter/tests/test_lpi_filter.py @@ -8,7 +8,8 @@ from skimage.io import * from skimage.filter import * -class TestLPIFilter2D(): +class TestLPIFilter2D(object): + img = imread(os.path.join(data_dir, 'camera.png'), flatten=True)[:50, :50] @@ -55,5 +56,9 @@ class TestLPIFilter2D(): g1 = wiener(F[::-1, ::-1], self.filt_func) assert ((g - g1[::-1, ::-1]).sum() < 1) + def test_non_callable(self): + assert_raises(ValueError, LPIFilter2D, None) + + if __name__ == "__main__": run_module_suite() From d1629aec0f1a861106d54cb015b238e7fe542936 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 19:05:11 +0200 Subject: [PATCH 23/81] Fix polygon approximation for 0 or less tolerance --- skimage/measure/_polygon.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/measure/_polygon.py b/skimage/measure/_polygon.py index add4b5fb..7b9b920b 100644 --- a/skimage/measure/_polygon.py +++ b/skimage/measure/_polygon.py @@ -28,7 +28,7 @@ def approximate_polygon(coords, tolerance): ---------- .. [1] http://en.wikipedia.org/wiki/Ramer-Douglas-Peucker_algorithm """ - if tolerance == 0: + if tolerance <= 0: return coords chain = np.zeros(coords.shape[0], 'bool') From bee7223481e6899900087736132da7542a2eea58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 19:06:17 +0200 Subject: [PATCH 24/81] Full test coverage for polygon approximation and subdivision --- skimage/measure/tests/test_polygon.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/skimage/measure/tests/test_polygon.py b/skimage/measure/tests/test_polygon.py index 1907d7cb..c96aed88 100644 --- a/skimage/measure/tests/test_polygon.py +++ b/skimage/measure/tests/test_polygon.py @@ -22,6 +22,8 @@ def test_approximate_polygon(): out = approximate_polygon(square, -1) np.testing.assert_array_equal(out, square) + out = approximate_polygon(square, 0) + np.testing.assert_array_equal(out, square) def test_subdivide_polygon(): @@ -51,6 +53,10 @@ def test_subdivide_polygon(): np.testing.assert_equal(new_square3.shape[0], 2 * (square3.shape[0] - mask_len + 2)) + # not supported B-Spline degree + np.testing.assert_raises(ValueError, subdivide_polygon, square, 0) + np.testing.assert_raises(ValueError, subdivide_polygon, square, 8) + if __name__ == "__main__": np.testing.run_module_suite() From db76b212c736041ed2f6da9ec4bf70993a72bd63 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 19:23:58 +0200 Subject: [PATCH 25/81] Full test coverage for regionprops --- skimage/measure/tests/test_regionprops.py | 31 ++++++++++++++++++++--- 1 file changed, 27 insertions(+), 4 deletions(-) diff --git a/skimage/measure/tests/test_regionprops.py b/skimage/measure/tests/test_regionprops.py index 271c1ec4..524f55ee 100644 --- a/skimage/measure/tests/test_regionprops.py +++ b/skimage/measure/tests/test_regionprops.py @@ -1,9 +1,9 @@ from numpy.testing import assert_array_equal, assert_almost_equal, \ - assert_array_almost_equal + assert_array_almost_equal, assert_raises import numpy as np import math -from skimage.measure import regionprops +from skimage.measure._regionprops import regionprops, PROPS, perimeter SAMPLE = np.array( @@ -22,6 +22,16 @@ INTENSITY_SAMPLE = SAMPLE.copy() INTENSITY_SAMPLE[1, 9:11] = 2 +def test_unsupported_dtype(): + assert_raises(TypeError, regionprops, np.zeros((10, 10), dtype=np.double)) + + +def test_all_props(): + props = regionprops(SAMPLE, 'all', INTENSITY_SAMPLE)[0] + for prop in PROPS: + assert prop in props + + def test_area(): area = regionprops(SAMPLE, ['Area'])[0]['Area'] assert area == np.sum(SAMPLE) @@ -90,6 +100,11 @@ def test_eccentricity(): eps = regionprops(SAMPLE, ['Eccentricity'])[0]['Eccentricity'] assert_almost_equal(eps, 0.814629313427) + img = np.zeros((5, 5), dtype=np.int) + img[2, 2] = 1 + eps = regionprops(img, ['Eccentricity'])[0]['Eccentricity'] + assert_almost_equal(eps, 0) + def test_equiv_diameter(): diameter = regionprops(SAMPLE, ['EquivDiameter'])[0]['EquivDiameter'] @@ -142,6 +157,11 @@ def test_filled_area(): assert area == np.sum(SAMPLE) +def test_filled_image(): + img = regionprops(SAMPLE, ['FilledImage'])[0]['FilledImage'] + assert_array_equal(img, SAMPLE) + + def test_major_axis_length(): length = regionprops(SAMPLE, ['MajorAxisLength'])[0]['MajorAxisLength'] # MATLAB has different interpretation of ellipse than found in literature, @@ -220,8 +240,11 @@ def test_orientation(): assert_almost_equal(orientation_diag, -math.pi / 4) def test_perimeter(): - perimeter = regionprops(SAMPLE, ['Perimeter'])[0]['Perimeter'] - assert_almost_equal(perimeter, 59.2132034355964) + per = regionprops(SAMPLE, ['Perimeter'])[0]['Perimeter'] + assert_almost_equal(per, 59.2132034355964) + + per = perimeter(SAMPLE, neighbourhood=8) + assert_almost_equal(per, 43.1213203436) def test_solidity(): solidity = regionprops(SAMPLE, ['Solidity'])[0]['Solidity'] From aa85b22f6da450d258931efec8f87ac5165cdb29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 19:36:09 +0200 Subject: [PATCH 26/81] Full test coverage for structural similarity --- .../tests/test_structural_similarity.py | 32 ++++++++++++------- 1 file changed, 20 insertions(+), 12 deletions(-) diff --git a/skimage/measure/tests/test_structural_similarity.py b/skimage/measure/tests/test_structural_similarity.py index 3eb2a7e9..d2ddc774 100644 --- a/skimage/measure/tests/test_structural_similarity.py +++ b/skimage/measure/tests/test_structural_similarity.py @@ -1,5 +1,5 @@ import numpy as np -from numpy.testing import assert_equal +from numpy.testing import assert_equal, assert_raises from skimage.measure import structural_similarity as ssim @@ -24,20 +24,18 @@ def test_ssim_image(): S1 = ssim(X, Y, win_size=3) assert(S1 < 0.3) -## Come up with a better way of testing the gradient -## -## def test_ssim_grad(): -## N = 30 -## X = np.random.random((N, N)) * 255 -## Y = np.random.random((N, N)) * 255 -## def func(Y): -## return ssim(X, Y, dynamic_range=255) +def test_ssim_grad(): + N = 30 + X = np.random.random((N, N)) * 255 + Y = np.random.random((N, N)) * 255 -## def grad(Y): -## return ssim(X, Y, dynamic_range=255, gradient=True)[1] + f = ssim(X, Y, dynamic_range=255) + g = ssim(X, Y, dynamic_range=255, gradient=True) -## assert(np.all(opt.check_grad(func, grad, Y) < 0.05)) + assert f < 0.05 + assert g[0] < 0.05 + assert np.all(g[1] < 0.05) def test_ssim_dtype(): @@ -56,5 +54,15 @@ def test_ssim_dtype(): assert S2 < 0.1 +def test_invalid_input(): + X = np.zeros((3, 3), dtype=np.double) + Y = np.zeros((3, 3), dtype=np.int) + assert_raises(ValueError, ssim, X, Y) + + Y = np.zeros((4, 4), dtype=np.double) + assert_raises(ValueError, ssim, X, Y) + + assert_raises(ValueError, ssim, X, X, win_size=8) + if __name__ == "__main__": np.testing.run_module_suite() From 5117803b79ee56b412f550123e158507f759599c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 21:34:41 +0200 Subject: [PATCH 27/81] Improve test coverage of find_contours --- skimage/measure/find_contours.py | 2 +- skimage/measure/tests/test_find_contours.py | 62 ++++++++++++--------- 2 files changed, 36 insertions(+), 28 deletions(-) diff --git a/skimage/measure/find_contours.py b/skimage/measure/find_contours.py index 68e1d53c..eafbd523 100755 --- a/skimage/measure/find_contours.py +++ b/skimage/measure/find_contours.py @@ -98,7 +98,7 @@ def find_contours(array, level, """ array = np.asarray(array, dtype=np.double) if array.ndim != 2: - raise RuntimeError('Only 2D arrays are supported.') + raise TypeError('Only 2D arrays are supported.') level = float(level) if (fully_connected not in _param_options or positive_orientation not in _param_options): diff --git a/skimage/measure/tests/test_find_contours.py b/skimage/measure/tests/test_find_contours.py index 62b39b3f..cde60e4d 100644 --- a/skimage/measure/tests/test_find_contours.py +++ b/skimage/measure/tests/test_find_contours.py @@ -21,34 +21,37 @@ r = np.sqrt(x**2 + y**2) def test_binary(): - contours = find_contours(a, 0.5) + ref = [[6. , 1.5], + [5. , 1.5], + [4. , 1.5], + [3. , 1.5], + [2. , 1.5], + [1.5, 2. ], + [1.5, 3. ], + [1.5, 4. ], + [1.5, 5. ], + [1.5, 6. ], + [1. , 6.5], + [0.5, 6. ], + [0.5, 5. ], + [0.5, 4. ], + [0.5, 3. ], + [0.5, 2. ], + [0.5, 1. ], + [1. , 0.5], + [2. , 0.5], + [3. , 0.5], + [4. , 0.5], + [5. , 0.5], + [6. , 0.5], + [6.5, 1. ], + [6. , 1.5]] + + contours = find_contours(a, 0.5, positive_orientation='high') assert len(contours) == 1 - assert_array_equal(contours[0], - [[6. , 1.5], - [5. , 1.5], - [4. , 1.5], - [3. , 1.5], - [2. , 1.5], - [1.5, 2. ], - [1.5, 3. ], - [1.5, 4. ], - [1.5, 5. ], - [1.5, 6. ], - [1. , 6.5], - [0.5, 6. ], - [0.5, 5. ], - [0.5, 4. ], - [0.5, 3. ], - [0.5, 2. ], - [0.5, 1. ], - [1. , 0.5], - [2. , 0.5], - [3. , 0.5], - [4. , 0.5], - [5. , 0.5], - [6. , 0.5], - [6.5, 1. ], - [6. , 1.5]]) + assert_array_equal(contours[0][::-1], ref) + + def test_float(): @@ -70,6 +73,11 @@ def test_memory_order(): assert len(contours) == 1 +def test_invalid_input(): + assert_raises(ValueError, find_contours, r, 0.5, 'foo', 'bar') + assert_raises(TypeError, find_contours, r[..., None], 0.5) + + if __name__ == '__main__': from numpy.testing import run_module_suite run_module_suite() From 48572fd0a3dfa90404b69916a97cb66a51e44c58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 21:52:15 +0200 Subject: [PATCH 28/81] Remove obsolete license note as code has been refactored --- skimage/morphology/grey.py | 7 ------- 1 file changed, 7 deletions(-) diff --git a/skimage/morphology/grey.py b/skimage/morphology/grey.py index e7e52de4..47ef1d2c 100644 --- a/skimage/morphology/grey.py +++ b/skimage/morphology/grey.py @@ -1,10 +1,3 @@ -""" -:author: Damian Eads, 2009 -:license: modified BSD -""" - -__docformat__ = 'restructuredtext en' - import warnings from skimage import img_as_ubyte From 0ab93bbf366d0e938625cadb775180a6496dd80a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 21:54:12 +0200 Subject: [PATCH 29/81] Remove redundant dtype conversion --- skimage/morphology/grey.py | 2 -- 1 file changed, 2 deletions(-) diff --git a/skimage/morphology/grey.py b/skimage/morphology/grey.py index 47ef1d2c..69050773 100644 --- a/skimage/morphology/grey.py +++ b/skimage/morphology/grey.py @@ -254,7 +254,6 @@ def white_tophat(image, selem, out=None): """ if image is out: raise NotImplementedError("Cannot perform white top hat in place.") - image = img_as_ubyte(image) out = opening(image, selem, out=out) out = image - out @@ -304,7 +303,6 @@ def black_tophat(image, selem, out=None): if image is out: raise NotImplementedError("Cannot perform white top hat in place.") - image = img_as_ubyte(image) out = closing(image, selem, out=out) out = out - image From bc745e833aa6f983a2d28f67b0b0f22ead798be1 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 7 Oct 2012 15:07:11 -0400 Subject: [PATCH 30/81] BUG: Pass package directory as positional argument to nose.run When the package directory is passed to nosetest via the "where" argument (-w), that directory becomes the working directory. This causes problems because `skimage.io` will take precedence over the builtin `io` package. --- skimage/__init__.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/__init__.py b/skimage/__init__.py index c8935cb6..cf62ee87 100644 --- a/skimage/__init__.py +++ b/skimage/__init__.py @@ -65,7 +65,7 @@ except ImportError: def _setup_test(verbose=False): import functools - args = ['', '--exe', '-w', pkg_dir] + args = ['', pkg_dir, '--exe'] if verbose: args.extend(['-v', '-s']) From 500b1c507ceabe21bbc4bb1e7e82ea7e48075755 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 7 Oct 2012 15:33:03 -0400 Subject: [PATCH 31/81] ENH: Add grayscale support and color adjustment to visualize_boundaries --- skimage/segmentation/boundaries.py | 32 ++++++++++++++++++++++++------ 1 file changed, 26 insertions(+), 6 deletions(-) diff --git a/skimage/segmentation/boundaries.py b/skimage/segmentation/boundaries.py index b40ecb01..0d8be0f3 100644 --- a/skimage/segmentation/boundaries.py +++ b/skimage/segmentation/boundaries.py @@ -1,19 +1,39 @@ import numpy as np from ..morphology import dilation, square from ..util import img_as_float +from ..color import gray2rgb def find_boundaries(label_img): + """Return bool array where boundaries between labeled regions are True.""" boundaries = np.zeros(label_img.shape, dtype=np.bool) boundaries[1:, :] += label_img[1:, :] != label_img[:-1, :] boundaries[:, 1:] += label_img[:, 1:] != label_img[:, :-1] return boundaries -def visualize_boundaries(img, label_img): - img = img_as_float(img, force_copy=True) +def visualize_boundaries(image, label_img, color=(1, 1, 0), outline_color=None): + """Return image with boundaries between labeled regions highlighted. + + Parameters + ---------- + image : (M, N[, 3]) array + Grayscale or RGB image. + label_img : (M, N) array + Label array where regions are marked by different integer values. + color : length-3 sequence + RGB color of boundaries in the output image. + outline_color : length-3 sequence + RGB color surrounding boundaries in the output image. If None, no + outline is drawn. + """ + if image.ndim == 2: + image = gray2rgb(image) + image = img_as_float(image, force_copy=True) + boundaries = find_boundaries(label_img) - outer_boundaries = dilation(boundaries.astype(np.uint8), square(2)) - img[outer_boundaries != 0, :] = np.array([0, 0, 0]) # black - img[boundaries, :] = np.array([1, 1, 0]) # yellow - return img + if outline_color is not None: + outer_boundaries = dilation(boundaries.astype(np.uint8), square(2)) + image[outer_boundaries != 0, :] = np.array(outline_color) + image[boundaries, :] = np.array(color) + return image From 694ac11f930639e948080790626172a762d4a434 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 7 Oct 2012 15:43:28 -0400 Subject: [PATCH 32/81] STY: Rename visualize_boundaries to highlight_boundaries Add @deprecated decorator to ease the transition. --- doc/examples/plot_segmentations.py | 10 +++---- skimage/_shared/utils.py | 43 ++++++++++++++++++++++++++++++ skimage/segmentation/__init__.py | 3 ++- skimage/segmentation/boundaries.py | 8 +++++- 4 files changed, 57 insertions(+), 7 deletions(-) create mode 100644 skimage/_shared/utils.py diff --git a/doc/examples/plot_segmentations.py b/doc/examples/plot_segmentations.py index 99bfefcc..31dc38e7 100644 --- a/doc/examples/plot_segmentations.py +++ b/doc/examples/plot_segmentations.py @@ -63,8 +63,8 @@ import matplotlib.pyplot as plt import numpy as np from skimage.data import lena -from skimage.segmentation import felzenszwalb, \ - visualize_boundaries, slic, quickshift +from skimage.segmentation import felzenszwalb, slic, quickshift +from skimage.segmentation import highlight_boundaries from skimage.util import img_as_float img = img_as_float(lena()[::2, ::2]) @@ -80,11 +80,11 @@ fig, ax = plt.subplots(1, 3) fig.set_size_inches(8, 3, forward=True) plt.subplots_adjust(0.05, 0.05, 0.95, 0.95, 0.05, 0.05) -ax[0].imshow(visualize_boundaries(img, segments_fz)) +ax[0].imshow(highlight_boundaries(img, segments_fz)) ax[0].set_title("Felzenszwalbs's method") -ax[1].imshow(visualize_boundaries(img, segments_slic)) +ax[1].imshow(highlight_boundaries(img, segments_slic)) ax[1].set_title("SLIC") -ax[2].imshow(visualize_boundaries(img, segments_quick)) +ax[2].imshow(highlight_boundaries(img, segments_quick)) ax[2].set_title("Quickshift") for a in ax: a.set_xticks(()) diff --git a/skimage/_shared/utils.py b/skimage/_shared/utils.py new file mode 100644 index 00000000..4075ddb4 --- /dev/null +++ b/skimage/_shared/utils.py @@ -0,0 +1,43 @@ +import warnings +import functools + + +__all__ = ['deprecated'] + + +class deprecated(object): + """Decorator to mark deprecated functions with warning. + + Adapted from . + + Parameters + ---------- + alt_func : str + If given, tell user what function to use instead. + behavior : {'warn', 'raise'} + Behavior during call to deprecated function: 'warn' = warn user that + function is deprecated; 'raise' = raise error. + """ + + def __init__(self, alt_func=None, behavior='warn'): + self.alt_func = alt_func + self.behavior = behavior + + def __call__(self, func): + + msg = "Call to deprecated function `%s`." % func.__name__ + if self.alt_func is not None: + msg = msg + " Use `%s` instead." % self.alt_func + + @functools.wraps(func) + def wrapped(*args, **kwargs): + if self.behavior == 'warn': + warnings.warn_explicit(msg, + category=DeprecationWarning, + filename=func.func_code.co_filename, + lineno=func.func_code.co_firstlineno + 1) + elif self.behavior == 'raise': + raise DeprecationWarning(msg) + return func(*args, **kwargs) + + return wrapped diff --git a/skimage/segmentation/__init__.py b/skimage/segmentation/__init__.py index 9dca2bc3..ce0bfd84 100644 --- a/skimage/segmentation/__init__.py +++ b/skimage/segmentation/__init__.py @@ -2,5 +2,6 @@ from .random_walker_segmentation import random_walker from ._felzenszwalb import felzenszwalb from ._slic import slic from ._quickshift import quickshift -from .boundaries import find_boundaries, visualize_boundaries +from .boundaries import (find_boundaries, visualize_boundaries, + highlight_boundaries) from ._clear_border import clear_border diff --git a/skimage/segmentation/boundaries.py b/skimage/segmentation/boundaries.py index 0d8be0f3..d30a8627 100644 --- a/skimage/segmentation/boundaries.py +++ b/skimage/segmentation/boundaries.py @@ -2,6 +2,7 @@ import numpy as np from ..morphology import dilation, square from ..util import img_as_float from ..color import gray2rgb +from .._shared.utils import deprecated def find_boundaries(label_img): @@ -12,7 +13,7 @@ def find_boundaries(label_img): return boundaries -def visualize_boundaries(image, label_img, color=(1, 1, 0), outline_color=None): +def highlight_boundaries(image, label_img, color=(1, 1, 0), outline_color=None): """Return image with boundaries between labeled regions highlighted. Parameters @@ -37,3 +38,8 @@ def visualize_boundaries(image, label_img, color=(1, 1, 0), outline_color=None): image[outer_boundaries != 0, :] = np.array(outline_color) image[boundaries, :] = np.array(color) return image + + +@deprecated('highlight_boundaries') +def visualize_boundaries(*args, **kwargs): + return highlight_boundaries(*args, **kwargs) From b16ba3daf249d954ff52e02d7467f51a1271521d Mon Sep 17 00:00:00 2001 From: Nicolas Pinto Date: Sun, 7 Oct 2012 13:30:07 -0700 Subject: [PATCH 33/81] BUG: fix side-effect in util.montage() --- skimage/util/montage.py | 2 ++ 1 file changed, 2 insertions(+) diff --git a/skimage/util/montage.py b/skimage/util/montage.py index 1a8cda23..587c0939 100644 --- a/skimage/util/montage.py +++ b/skimage/util/montage.py @@ -71,6 +71,8 @@ def montage2d(arr_in, fill='mean', rescale_intensity=False): assert arr_in.ndim == 3 n_images, height, width = arr_in.shape + + arr_in = arr_in.copy() # -- rescale intensity if necessary if rescale_intensity: From ad53159d60ed05ebccb3e9d895ead21c9f3de7ad Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Sun, 7 Oct 2012 19:23:38 -0400 Subject: [PATCH 34/81] STY: Rename highlight_boundaries to mark_boundaries --- doc/examples/plot_segmentations.py | 8 ++++---- skimage/segmentation/__init__.py | 3 +-- skimage/segmentation/boundaries.py | 6 +++--- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/doc/examples/plot_segmentations.py b/doc/examples/plot_segmentations.py index 31dc38e7..418a0903 100644 --- a/doc/examples/plot_segmentations.py +++ b/doc/examples/plot_segmentations.py @@ -64,7 +64,7 @@ import numpy as np from skimage.data import lena from skimage.segmentation import felzenszwalb, slic, quickshift -from skimage.segmentation import highlight_boundaries +from skimage.segmentation import mark_boundaries from skimage.util import img_as_float img = img_as_float(lena()[::2, ::2]) @@ -80,11 +80,11 @@ fig, ax = plt.subplots(1, 3) fig.set_size_inches(8, 3, forward=True) plt.subplots_adjust(0.05, 0.05, 0.95, 0.95, 0.05, 0.05) -ax[0].imshow(highlight_boundaries(img, segments_fz)) +ax[0].imshow(mark_boundaries(img, segments_fz)) ax[0].set_title("Felzenszwalbs's method") -ax[1].imshow(highlight_boundaries(img, segments_slic)) +ax[1].imshow(mark_boundaries(img, segments_slic)) ax[1].set_title("SLIC") -ax[2].imshow(highlight_boundaries(img, segments_quick)) +ax[2].imshow(mark_boundaries(img, segments_quick)) ax[2].set_title("Quickshift") for a in ax: a.set_xticks(()) diff --git a/skimage/segmentation/__init__.py b/skimage/segmentation/__init__.py index ce0bfd84..7bd37026 100644 --- a/skimage/segmentation/__init__.py +++ b/skimage/segmentation/__init__.py @@ -2,6 +2,5 @@ from .random_walker_segmentation import random_walker from ._felzenszwalb import felzenszwalb from ._slic import slic from ._quickshift import quickshift -from .boundaries import (find_boundaries, visualize_boundaries, - highlight_boundaries) +from .boundaries import find_boundaries, visualize_boundaries, mark_boundaries from ._clear_border import clear_border diff --git a/skimage/segmentation/boundaries.py b/skimage/segmentation/boundaries.py index d30a8627..25656a9b 100644 --- a/skimage/segmentation/boundaries.py +++ b/skimage/segmentation/boundaries.py @@ -13,7 +13,7 @@ def find_boundaries(label_img): return boundaries -def highlight_boundaries(image, label_img, color=(1, 1, 0), outline_color=None): +def mark_boundaries(image, label_img, color=(1, 1, 0), outline_color=None): """Return image with boundaries between labeled regions highlighted. Parameters @@ -40,6 +40,6 @@ def highlight_boundaries(image, label_img, color=(1, 1, 0), outline_color=None): return image -@deprecated('highlight_boundaries') +@deprecated('mark_boundaries') def visualize_boundaries(*args, **kwargs): - return highlight_boundaries(*args, **kwargs) + return mark_boundaries(*args, **kwargs) From 2c36d34f9a109378fca0535027d5768c91582087 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Mon, 8 Oct 2012 10:55:19 +0200 Subject: [PATCH 35/81] Change Exception type for wrong input dims --- skimage/measure/find_contours.py | 2 +- skimage/measure/tests/test_find_contours.py | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/measure/find_contours.py b/skimage/measure/find_contours.py index eafbd523..3a546ccf 100755 --- a/skimage/measure/find_contours.py +++ b/skimage/measure/find_contours.py @@ -98,7 +98,7 @@ def find_contours(array, level, """ array = np.asarray(array, dtype=np.double) if array.ndim != 2: - raise TypeError('Only 2D arrays are supported.') + raise ValueError('Only 2D arrays are supported.') level = float(level) if (fully_connected not in _param_options or positive_orientation not in _param_options): diff --git a/skimage/measure/tests/test_find_contours.py b/skimage/measure/tests/test_find_contours.py index cde60e4d..11b9b443 100644 --- a/skimage/measure/tests/test_find_contours.py +++ b/skimage/measure/tests/test_find_contours.py @@ -75,7 +75,7 @@ def test_memory_order(): def test_invalid_input(): assert_raises(ValueError, find_contours, r, 0.5, 'foo', 'bar') - assert_raises(TypeError, find_contours, r[..., None], 0.5) + assert_raises(ValueError, find_contours, r[..., None], 0.5) if __name__ == '__main__': From fd07bd65ba665378f4e17f8e68f10e3aa351fd20 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 8 Oct 2012 09:37:49 -0700 Subject: [PATCH 36/81] DOC: Rename skimage.org to scikit-image.org. --- doc/source/_static/docversions.js | 2 +- doc/source/gitwash/this_project.inc | 2 +- doc/source/overview.txt | 4 ++-- doc/source/random_gallery.py | 4 ++-- doc/source/themes/scikit-image/layout.html | 2 +- 5 files changed, 7 insertions(+), 7 deletions(-) diff --git a/doc/source/_static/docversions.js b/doc/source/_static/docversions.js index ff910c3f..0b414325 100644 --- a/doc/source/_static/docversions.js +++ b/doc/source/_static/docversions.js @@ -12,6 +12,6 @@ function insert_version_links() { document.write(open_list); document.write('skimage VERSION
    • \n' .replace('VERSION', labels[i]) - .replace('URL', 'http://skimage.org/docs/' + labels[i])); + .replace('URL', 'http://scikit-image.org/docs/' + labels[i])); } } diff --git a/doc/source/gitwash/this_project.inc b/doc/source/gitwash/this_project.inc index 6010831f..349b92ba 100644 --- a/doc/source/gitwash/this_project.inc +++ b/doc/source/gitwash/this_project.inc @@ -1,5 +1,5 @@ .. scikit-image -.. _scikit-image: http://skimage.org +.. _scikit-image: http://scikit-image.org .. _`scikit-image github`: http://github.com/scikit-image/scikit-image .. _`scikit-image mailing list`: http://groups.google.com/group/scikit-image diff --git a/doc/source/overview.txt b/doc/source/overview.txt index 3acdeebf..5a4e6123 100644 --- a/doc/source/overview.txt +++ b/doc/source/overview.txt @@ -1,7 +1,7 @@ Image Processing SciKit ======================= -The `scikit-image `__ SciKit (toolkit for +The `scikit-image `__ SciKit (toolkit for `SciPy `__) extends ``scipy.ndimage`` to provide a versatile set of image processing routines. It is written in the `Python `_ language. @@ -12,7 +12,7 @@ mailing list (address provided below). Homepage -------- -http://skimage.org +http://scikit-image.org Source, bugs and patches ------------------------ diff --git a/doc/source/random_gallery.py b/doc/source/random_gallery.py index 3358b3f0..47ce89a2 100644 --- a/doc/source/random_gallery.py +++ b/doc/source/random_gallery.py @@ -32,8 +32,8 @@ gallery_div = '''\ examples = glob.glob(os.path.join(example_dir, 'plot_*.py')) images, links = [], [] -image_url = 'http://skimage.org/docs/dev/_images/%s.png' -link_url = 'http://skimage.org/docs/dev/auto_examples/%s.html' +image_url = 'http://scikit-image.org/docs/dev/_images/%s.png' +link_url = 'http://scikit-image.org/docs/dev/auto_examples/%s.html' for e in examples: e = os.path.basename(e) diff --git a/doc/source/themes/scikit-image/layout.html b/doc/source/themes/scikit-image/layout.html index a1755670..58424f2f 100644 --- a/doc/source/themes/scikit-image/layout.html +++ b/doc/source/themes/scikit-image/layout.html @@ -79,7 +79,7 @@ {%- block extrahead %}{% endblock %} - +
    From 4946222e3a52e7101f5988540f9575356840de21 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 8 Oct 2012 09:52:12 -0700 Subject: [PATCH 37/81] DOC: Remove confusing paragraph about dtype range. --- doc/source/user_guide/data_types.txt | 5 ----- 1 file changed, 5 deletions(-) diff --git a/doc/source/user_guide/data_types.txt b/doc/source/user_guide/data_types.txt index 9801c244..c3b87b2e 100644 --- a/doc/source/user_guide/data_types.txt +++ b/doc/source/user_guide/data_types.txt @@ -71,11 +71,6 @@ issued:: float64 to uint8 array([ 0, 128, 255], dtype=uint8) -Wherever possible, functions should try to handle input without explicit -conversion. For example, there is no need to force values to a specific type -for doing a convolution; a plotting function, on the other hand, needs to know -the range of the input. - Output types ============ From b4b090271d68b89d7881aeb7e63d84361ddbc607 Mon Sep 17 00:00:00 2001 From: Paul Ivanov Date: Mon, 8 Oct 2012 16:29:55 -0700 Subject: [PATCH 38/81] complete singularization of scikit-image I've updated references in the code and documentation to the new name. --- DEVELOPMENT.txt | 8 ++++---- LICENSE.txt | 2 +- README.rst | 4 ++-- RELEASE.txt | 2 +- TASKS.txt | 4 ++-- bento.info | 8 ++++---- doc/Makefile | 8 ++++---- doc/logo/Makefile | 4 ++-- doc/logo/{scikits_image_logo.py => scikit_image_logo.py} | 0 doc/logo/shrink_logo.py | 4 ++-- doc/make.bat | 4 ++-- doc/source/conf.py | 4 ++-- setup.py | 8 ++++---- skimage/__init__.py | 2 +- skimage/_shared/setup.py | 8 ++++---- skimage/draw/setup.py | 8 ++++---- skimage/feature/setup.py | 8 ++++---- skimage/filter/setup.py | 8 ++++---- skimage/graph/setup.py | 6 +++--- skimage/io/_plugins/skivi.py | 4 ++-- skimage/io/setup.py | 6 +++--- skimage/measure/setup.py | 6 +++--- skimage/morphology/setup.py | 6 +++--- skimage/segmentation/setup.py | 6 +++--- skimage/transform/setup.py | 8 ++++---- 25 files changed, 68 insertions(+), 68 deletions(-) rename doc/logo/{scikits_image_logo.py => scikit_image_logo.py} (100%) diff --git a/DEVELOPMENT.txt b/DEVELOPMENT.txt index 0dd0a102..509cf322 100644 --- a/DEVELOPMENT.txt +++ b/DEVELOPMENT.txt @@ -4,8 +4,8 @@ Development process :doc:`Read this overview ` of how to use Git with ``skimage``. Here's the long and short of it: - * Go to `https://github.com/scikits-image/scikits-image - `_ and follow the + * Go to `https://github.com/scikit-image/scikit-image + `_ and follow the instructions on making your own fork. * Create a new branch for the feature you want to work on. Since the branch name will appear in the merge message, use a sensible name @@ -42,7 +42,7 @@ Guidelines * Follow the `Python PEPs `_ where possible. * No major changes should be committed without review. Ask on the - `mailing list `_ if + `mailing list `_ if you get no response to your pull request. * Examples in the gallery should have a maximum figure width of 8 inches. @@ -99,4 +99,4 @@ detailing the test coverage:: Bugs ```` -Please `report bugs on Github `_. +Please `report bugs on Github `_. diff --git a/LICENSE.txt b/LICENSE.txt index b75d150d..6586c853 100644 --- a/LICENSE.txt +++ b/LICENSE.txt @@ -1,7 +1,7 @@ Unless otherwise specified by LICENSE.txt files in individual directories, all code is -Copyright (C) 2011, the scikits-image team +Copyright (C) 2011, the scikit-image team All rights reserved. Redistribution and use in source and binary forms, with or without diff --git a/README.rst b/README.rst index a419b83a..508db396 100644 --- a/README.rst +++ b/README.rst @@ -3,11 +3,11 @@ Image Processing SciKit Source ------ -https://github.com/scikits-image/scikits-image +https://github.com/scikit-image/scikit-image Mailing List ------------ -http://groups.google.com/group/scikits-image +http://groups.google.com/group/scikit-image Installation from source ------------------------ diff --git a/RELEASE.txt b/RELEASE.txt index 96cd2abc..ce05e24e 100644 --- a/RELEASE.txt +++ b/RELEASE.txt @@ -38,7 +38,7 @@ How to make a new release of ``skimage`` - In ``bento.info``, set to ``0.X.dev0``. - Update the web frontpage: - The webpage is kept in a separate repo: scikits-image-web + The webpage is kept in a separate repo: scikit-image-web - Sync your branch with the remote repo: ``git pull``. If you try to ``make gh-pages`` when your branch is out of sync, it diff --git a/TASKS.txt b/TASKS.txt index 9a846be9..a2fcffe2 100644 --- a/TASKS.txt +++ b/TASKS.txt @@ -16,13 +16,13 @@ How to contribute to ``skimage`` Developing Open Source is great fun! Join us on the `skimage mailing -list `_ and tell us which of the +list `_ and tell us which of the following challenges you'd like to solve. * Mentoring is available for those new to scientific programming in Python. * The technical detail of the `development process`_ is given below. * :doc:`How to use GitHub ` when developing skimage -* If you're looking something to implement, you can find a list of `requested features on github `__. In addition, you can browse the `open issues on github `__. +* If you're looking something to implement, you can find a list of `requested features on github `__. In addition, you can browse the `open issues on github `__. .. contents:: :local: diff --git a/bento.info b/bento.info index 3e630bc0..50a2743a 100644 --- a/bento.info +++ b/bento.info @@ -1,15 +1,15 @@ -Name: scikits-image +Name: scikit-image Version: 0.8.dev0 Summary: Image processing routines for SciPy -Url: http://scikits-image.org -DownloadUrl: http://github.com/scikits-image/scikits-image +Url: http://scikit-image.org +DownloadUrl: http://github.com/scikit-image/scikit-image Description: Image Processing SciKit Image processing algorithms for SciPy, including IO, morphology, filtering, warping, color manipulation, object detection, etc. Please refer to the online documentation at - http://scikits-image.org/ + http://scikit-image.org/ Maintainer: Stefan van der Walt MaintainerEmail: stefan@sun.ac.za License: Modified BSD diff --git a/doc/Makefile b/doc/Makefile index ea6e26e3..c21945dd 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -77,17 +77,17 @@ qthelp: @echo @echo "Build finished; now you can run "qcollectiongenerator" with the" \ ".qhcp project file in build/qthelp, like this:" - @echo "# qcollectiongenerator build/qthelp/scikitsimage.qhcp" + @echo "# qcollectiongenerator build/qthelp/scikitimage.qhcp" @echo "To view the help file:" - @echo "# assistant -collectionFile build/qthelp/scikitsimage.qhc" + @echo "# assistant -collectionFile build/qthelp/scikitimage.qhc" devhelp: $(SPHINXBUILD) -b devhelp $(ALLSPHINXOPTS) $(DEST)/devhelp @echo @echo "Build finished." @echo "To view the help file:" - @echo "# mkdir -p $$HOME/.local/share/devhelp/scikitsimage" - @echo "# ln -s build/devhelp $$HOME/.local/share/devhelp/scikitsimage" + @echo "# mkdir -p $$HOME/.local/share/devhelp/scikitimage" + @echo "# ln -s build/devhelp $$HOME/.local/share/devhelp/scikitimage" @echo "# devhelp" latex: diff --git a/doc/logo/Makefile b/doc/logo/Makefile index 46c36fda..1cf861bd 100644 --- a/doc/logo/Makefile +++ b/doc/logo/Makefile @@ -1,11 +1,11 @@ .PHONY: logo logo: green_orange_snake.png snake_logo.svg - inkscape --export-png=scikits_image_logo.png --export-dpi=100 \ + inkscape --export-png=scikit_image_logo.png --export-dpi=100 \ --export-area-drawing --export-background-opacity=1 \ snake_logo.svg python shrink_logo.py green_orange_snake.png: - python scikits_image_logo.py --no-plot + python scikit_image_logo.py --no-plot diff --git a/doc/logo/scikits_image_logo.py b/doc/logo/scikit_image_logo.py similarity index 100% rename from doc/logo/scikits_image_logo.py rename to doc/logo/scikit_image_logo.py diff --git a/doc/logo/shrink_logo.py b/doc/logo/shrink_logo.py index 3b7d91ba..205e1bf4 100644 --- a/doc/logo/shrink_logo.py +++ b/doc/logo/shrink_logo.py @@ -2,7 +2,7 @@ from skimage import io, transform s = 0.7 -img = io.imread('scikits_image_logo.png') +img = io.imread('scikit_image_logo.png') h, w, c = img.shape print "\nScaling down logo by %.1fx..." % s @@ -13,4 +13,4 @@ img = transform.homography(img, [[s, 0, 0], output_shape=(int(h*s), int(w*s), 4), order=3) -io.imsave('scikits_image_logo_small.png', img) +io.imsave('scikit_image_logo_small.png', img) diff --git a/doc/make.bat b/doc/make.bat index 9d4d3185..e16c8d40 100644 --- a/doc/make.bat +++ b/doc/make.bat @@ -74,9 +74,9 @@ if "%1" == "qthelp" ( echo. echo.Build finished; now you can run "qcollectiongenerator" with the ^ .qhcp project file in build/qthelp, like this: - echo.^> qcollectiongenerator build\qthelp\scikitsimage.qhcp + echo.^> qcollectiongenerator build\qthelp\scikitimage.qhcp echo.To view the help file: - echo.^> assistant -collectionFile build\qthelp\scikitsimage.ghc + echo.^> assistant -collectionFile build\qthelp\scikitimage.ghc goto end ) diff --git a/doc/source/conf.py b/doc/source/conf.py index 71033adc..5071fab1 100644 --- a/doc/source/conf.py +++ b/doc/source/conf.py @@ -176,7 +176,7 @@ html_sidebars = { #html_file_suffix = '' # Output file base name for HTML help builder. -htmlhelp_basename = 'scikitsimagedoc' +htmlhelp_basename = 'scikitimagedoc' # -- Options for LaTeX output -------------------------------------------------- @@ -190,7 +190,7 @@ htmlhelp_basename = 'scikitsimagedoc' # Grouping the document tree into LaTeX files. List of tuples # (source start file, target name, title, author, documentclass [howto/manual]). latex_documents = [ - ('contents', 'scikitsimage.tex', u'The Image Scikit Documentation', + ('contents', 'scikitimage.tex', u'The Image Scikit Documentation', u'SciPy Developers', 'manual'), ] diff --git a/setup.py b/setup.py index 9823352c..390f007c 100644 --- a/setup.py +++ b/setup.py @@ -6,17 +6,17 @@ Image processing algorithms for SciPy, including IO, morphology, filtering, warping, color manipulation, object detection, etc. Please refer to the online documentation at -http://scikits-image.org/ +http://scikit-image.org/ """ -DISTNAME = 'scikits-image' +DISTNAME = 'scikit-image' DESCRIPTION = 'Image processing routines for SciPy' LONG_DESCRIPTION = descr MAINTAINER = 'Stefan van der Walt' MAINTAINER_EMAIL = 'stefan@sun.ac.za' -URL = 'http://scikits-image.org' +URL = 'http://scikit-image.org' LICENSE = 'Modified BSD' -DOWNLOAD_URL = 'http://github.com/scikits-image/scikits-image' +DOWNLOAD_URL = 'http://github.com/scikit-image/scikit-image' VERSION = '0.8dev' PYTHON_VERSION = (2, 5) DEPENDENCIES = { diff --git a/skimage/__init__.py b/skimage/__init__.py index cf62ee87..1ac121b3 100644 --- a/skimage/__init__.py +++ b/skimage/__init__.py @@ -1,6 +1,6 @@ """Image Processing SciKit (Toolbox for SciPy) -``scikits-image`` (a.k.a. ``skimage``) is a collection of algorithms for image +``scikit-image`` (a.k.a. ``skimage``) is a collection of algorithms for image processing and computer vision. The main package of ``skimage`` only provides a few utilities for converting diff --git a/skimage/_shared/setup.py b/skimage/_shared/setup.py index 81113656..765c30de 100644 --- a/skimage/_shared/setup.py +++ b/skimage/_shared/setup.py @@ -28,11 +28,11 @@ def configuration(parent_package='', top_path=None): if __name__ == '__main__': from numpy.distutils.core import setup - setup(maintainer='Scikits-image Developers', - author='Scikits-image Developers', - maintainer_email='scikits-image@googlegroups.com', + setup(maintainer='scikit-image Developers', + author='scikit-image Developers', + maintainer_email='scikit-image@googlegroups.com', description='Transforms', - url='https://github.com/scikits-image/scikits-image', + url='https://github.com/scikit-image/scikit-image', license='SciPy License (BSD Style)', **(configuration(top_path='').todict()) ) diff --git a/skimage/draw/setup.py b/skimage/draw/setup.py index 59067f9a..5b8e237d 100644 --- a/skimage/draw/setup.py +++ b/skimage/draw/setup.py @@ -21,11 +21,11 @@ def configuration(parent_package='', top_path=None): if __name__ == '__main__': from numpy.distutils.core import setup - setup(maintainer='scikits-image developers', - author='scikits-image developers', - maintainer_email='scikits-image@googlegroups.com', + setup(maintainer='scikit-image developers', + author='scikit-image developers', + maintainer_email='scikit-image@googlegroups.com', description='Drawing', - url='https://github.com/scikits-image/scikits-image', + url='https://github.com/scikit-image/scikit-image', license='SciPy License (BSD Style)', **(configuration(top_path='').todict()) ) diff --git a/skimage/feature/setup.py b/skimage/feature/setup.py index 9c9074be..6f820163 100644 --- a/skimage/feature/setup.py +++ b/skimage/feature/setup.py @@ -24,11 +24,11 @@ def configuration(parent_package='', top_path=None): if __name__ == '__main__': from numpy.distutils.core import setup - setup(maintainer='scikits-image Developers', - author='scikits-image Developers', - maintainer_email='scikits-image@googlegroups.com', + setup(maintainer='scikit-image Developers', + author='scikit-image Developers', + maintainer_email='scikit-image@googlegroups.com', description='Features', - url='https://github.com/scikits-image/scikits-image', + url='https://github.com/scikit-image/scikit-image', license='SciPy License (BSD Style)', **(configuration(top_path='').todict()) ) diff --git a/skimage/filter/setup.py b/skimage/filter/setup.py index 03ea7def..3e573aec 100644 --- a/skimage/filter/setup.py +++ b/skimage/filter/setup.py @@ -21,11 +21,11 @@ def configuration(parent_package='', top_path=None): if __name__ == '__main__': from numpy.distutils.core import setup - setup(maintainer='scikits-image Developers', - author='scikits-image Developers', - maintainer_email='scikits-image@googlegroups.com', + setup(maintainer='scikit-image Developers', + author='scikit-image Developers', + maintainer_email='scikit-image@googlegroups.com', description='Filters', - url='https://github.com/scikits-image/scikits-image', + url='https://github.com/scikit-image/scikit-image', license='SciPy License (BSD Style)', **(configuration(top_path='').todict()) ) diff --git a/skimage/graph/setup.py b/skimage/graph/setup.py index 2c432011..463d2739 100644 --- a/skimage/graph/setup.py +++ b/skimage/graph/setup.py @@ -29,10 +29,10 @@ def configuration(parent_package='', top_path=None): if __name__ == '__main__': from numpy.distutils.core import setup - setup(maintainer='scikits-image Developers', - maintainer_email='scikits-image@googlegroups.com', + setup(maintainer='scikit-image Developers', + maintainer_email='scikit-image@googlegroups.com', description='Graph-based Image-processing Algorithms', - url='https://github.com/scikits-image/scikits-image', + url='https://github.com/scikit-image/scikit-image', license='Modified BSD', **(configuration(top_path='').todict()) ) diff --git a/skimage/io/_plugins/skivi.py b/skimage/io/_plugins/skivi.py index fb652638..fcfe8bc6 100644 --- a/skimage/io/_plugins/skivi.py +++ b/skimage/io/_plugins/skivi.py @@ -3,9 +3,9 @@ Skivi is written/maintained/developed by: S. Chris Colbert - sccolbert@gmail.com -Skivi is free software and is part of the scikits-image project. +Skivi is free software and is part of the scikit-image project. -Skivi is governed by the licenses of the scikits-image project. +Skivi is governed by the licenses of the scikit-image project. Please report any bugs to the author. diff --git a/skimage/io/setup.py b/skimage/io/setup.py index 55526461..4e3c09c3 100644 --- a/skimage/io/setup.py +++ b/skimage/io/setup.py @@ -31,10 +31,10 @@ def configuration(parent_package='', top_path=None): if __name__ == '__main__': from numpy.distutils.core import setup - setup(maintainer='scikits-image Developers', - maintainer_email='scikits-image@googlegroups.com', + setup(maintainer='scikit-image Developers', + maintainer_email='scikit-image@googlegroups.com', description='Image I/O Routines', - url='https://github.com/scikits-image/scikits-image', + url='https://github.com/scikit-image/scikit-image', license='Modified BSD', **(configuration(top_path='').todict()) ) diff --git a/skimage/measure/setup.py b/skimage/measure/setup.py index 7e4ecf0f..21d9964e 100644 --- a/skimage/measure/setup.py +++ b/skimage/measure/setup.py @@ -24,10 +24,10 @@ def configuration(parent_package='', top_path=None): if __name__ == '__main__': from numpy.distutils.core import setup - setup(maintainer='scikits-image Developers', - maintainer_email='scikits-image@googlegroups.com', + setup(maintainer='scikit-image Developers', + maintainer_email='scikit-image@googlegroups.com', description='Graph-based Image-processing Algorithms', - url='https://github.com/scikits-image/scikits-image', + url='https://github.com/scikit-image/scikit-image', license='Modified BSD', **(configuration(top_path='').todict()) ) diff --git a/skimage/morphology/setup.py b/skimage/morphology/setup.py index 02c39ae7..b8564ce4 100644 --- a/skimage/morphology/setup.py +++ b/skimage/morphology/setup.py @@ -39,11 +39,11 @@ def configuration(parent_package='', top_path=None): if __name__ == '__main__': from numpy.distutils.core import setup - setup(maintainer='scikits-image Developers', + setup(maintainer='scikit-image Developers', author='Damian Eads', - maintainer_email='scikits-image@googlegroups.com', + maintainer_email='scikit-image@googlegroups.com', description='Morphology Wrapper', - url='https://github.com/scikits-image/scikits-image', + url='https://github.com/scikit-image/scikit-image', license='SciPy License (BSD Style)', **(configuration(top_path='').todict()) ) diff --git a/skimage/segmentation/setup.py b/skimage/segmentation/setup.py index b9e19078..ec4ac4ff 100644 --- a/skimage/segmentation/setup.py +++ b/skimage/segmentation/setup.py @@ -25,10 +25,10 @@ def configuration(parent_package='', top_path=None): if __name__ == '__main__': from numpy.distutils.core import setup - setup(maintainer='scikits-image Developers', - maintainer_email='scikits-image@googlegroups.com', + setup(maintainer='scikit-image Developers', + maintainer_email='scikit-image@googlegroups.com', description='Segmentation Algorithms', - url='https://github.com/scikits-image/scikits-image', + url='https://github.com/scikit-image/scikit-image', license='SciPy License (BSD Style)', **(configuration(top_path='').todict()) ) diff --git a/skimage/transform/setup.py b/skimage/transform/setup.py index 0e415bad..b0093d87 100644 --- a/skimage/transform/setup.py +++ b/skimage/transform/setup.py @@ -26,11 +26,11 @@ def configuration(parent_package='', top_path=None): if __name__ == '__main__': from numpy.distutils.core import setup - setup(maintainer='Scikits-image Developers', - author='Scikits-image Developers', - maintainer_email='scikits-image@googlegroups.com', + setup(maintainer='scikit-image Developers', + author='scikit-image Developers', + maintainer_email='scikit-image@googlegroups.com', description='Transforms', - url='https://github.com/scikits-image/scikits-image', + url='https://github.com/scikit-image/scikit-image', license='SciPy License (BSD Style)', **(configuration(top_path='').todict()) ) From d79d1ff7e3ec6c11db058531d54c1e3ed9bd88c7 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 8 Oct 2012 16:48:15 -0700 Subject: [PATCH 39/81] DOC: Clean up one last skimage -> scikit-image. --- doc/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/doc/Makefile b/doc/Makefile index c21945dd..7552be6b 100644 --- a/doc/Makefile +++ b/doc/Makefile @@ -124,7 +124,7 @@ gh-pages: gitwash: python tools/gitwash/gitwash_dumper.py source scikit-image \ - --project-url=http://skimage.org \ + --project-url=http://scikit-image.org \ --project-ml-url=http://groups.google.com/group/scikit-image \ --repo-name=scikit-image \ --github-user=scikit-image \ From 1ef13c124ec5b7bba59193c6ed11d763fe5dd80a Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 8 Oct 2012 16:57:01 -0700 Subject: [PATCH 40/81] PKG: Print something when bento check passes. --- check_bento_build.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/check_bento_build.py b/check_bento_build.py index d085b3ba..108b0aad 100644 --- a/check_bento_build.py +++ b/check_bento_build.py @@ -69,7 +69,8 @@ def print_results(cy_bento, cy_setup): print(text) print('-' * len(text)) - print # blank line; just for aesthetics + print "Bento errors:" + print "-------------" if cy_bento: info("The following extensions in 'bento.info' were not found:") From ab2411cd1913cdacf2eca9603692a1571ce7d3df Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Mon, 8 Oct 2012 20:30:33 -0400 Subject: [PATCH 41/81] DOC: Add imports to doctests to fix errors --- skimage/morphology/grey.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/skimage/morphology/grey.py b/skimage/morphology/grey.py index e7e52de4..45d11729 100644 --- a/skimage/morphology/grey.py +++ b/skimage/morphology/grey.py @@ -45,6 +45,7 @@ def erosion(image, selem, out=None, shift_x=False, shift_y=False): Examples -------- >>> # Erosion shrinks bright regions + >>> import numpy as np >>> from skimage.morphology import square >>> bright_square = np.array([[0, 0, 0, 0, 0], ... [0, 1, 1, 1, 0], @@ -97,6 +98,7 @@ def dilation(image, selem, out=None, shift_x=False, shift_y=False): Examples -------- >>> # Dilation enlarges bright regions + >>> import numpy as np >>> from skimage.morphology import square >>> bright_pixel = np.array([[0, 0, 0, 0, 0], ... [0, 0, 0, 0, 0], @@ -146,6 +148,7 @@ def opening(image, selem, out=None): Examples -------- >>> # Open up gap between two bright regions (but also shrink regions) + >>> import numpy as np >>> from skimage.morphology import square >>> bad_connection = np.array([[1, 0, 0, 0, 1], ... [1, 1, 0, 1, 1], @@ -196,6 +199,7 @@ def closing(image, selem, out=None): Examples -------- >>> # Close a gap between two bright lines + >>> import numpy as np >>> from skimage.morphology import square >>> broken_line = np.array([[0, 0, 0, 0, 0], ... [0, 0, 0, 0, 0], @@ -245,6 +249,7 @@ def white_tophat(image, selem, out=None): Examples -------- >>> # Subtract grey background from bright peak + >>> import numpy as np >>> from skimage.morphology import square >>> bright_on_grey = np.array([[2, 3, 3, 3, 2], ... [3, 4, 5, 4, 3], @@ -294,6 +299,7 @@ def black_tophat(image, selem, out=None): Examples -------- >>> # Change dark peak to bright peak and subtract background + >>> import numpy as np >>> from skimage.morphology import square >>> dark_on_grey = np.array([[7, 6, 6, 6, 7], ... [6, 5, 4, 5, 6], From 48210ecb389e6a6b94b58700863298b9f5e7a719 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 9 Oct 2012 07:53:54 +0200 Subject: [PATCH 42/81] Add note about random test failure for some systems --- skimage/measure/tests/test_structural_similarity.py | 1 + 1 file changed, 1 insertion(+) diff --git a/skimage/measure/tests/test_structural_similarity.py b/skimage/measure/tests/test_structural_similarity.py index d2ddc774..ac45072a 100644 --- a/skimage/measure/tests/test_structural_similarity.py +++ b/skimage/measure/tests/test_structural_similarity.py @@ -25,6 +25,7 @@ def test_ssim_image(): assert(S1 < 0.3) +# NOTE: This test is known to randomly fail on some systems (Mac OS X 10.6) def test_ssim_grad(): N = 30 X = np.random.random((N, N)) * 255 From e47411ed4c13379fd648eff0c459c79c57790f5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 9 Oct 2012 08:02:43 +0200 Subject: [PATCH 43/81] Split tests for different channel numbers into separate functions --- skimage/transform/tests/test_pyramids.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/skimage/transform/tests/test_pyramids.py b/skimage/transform/tests/test_pyramids.py index dd976a7b..6d0609e0 100644 --- a/skimage/transform/tests/test_pyramids.py +++ b/skimage/transform/tests/test_pyramids.py @@ -7,39 +7,39 @@ image = data.lena() image_gray = image[..., 0] -def test_pyramid_reduce(): - # RGB image +def test_pyramid_reduce_rgb(): rows, cols, dim = image.shape out = pyramids.pyramid_reduce(image, downscale=2) assert_array_equal(out.shape, (rows / 2, cols / 2, dim)) - # grayscale image + +def test_pyramid_reduce_gray(): rows, cols = image_gray.shape out = pyramids.pyramid_reduce(image_gray, downscale=2) assert_array_equal(out.shape, (rows / 2, cols / 2)) -def test_pyramid_expand(): - # RGB image +def test_pyramid_expand_rgb(): rows, cols, dim = image.shape out = pyramids.pyramid_expand(image, upscale=2) assert_array_equal(out.shape, (rows * 2, cols * 2, dim)) - # grayscale image + +def test_pyramid_expand_gray(): rows, cols = image_gray.shape out = pyramids.pyramid_expand(image_gray, upscale=2) assert_array_equal(out.shape, (rows * 2, cols * 2)) -def test_build_gaussian_pyramid(): - # RGB image +def test_build_gaussian_pyramid_rgb(): rows, cols, dim = image.shape pyramid = pyramids.pyramid_gaussian(image, downscale=2) for layer, out in enumerate(pyramid): layer_shape = (rows / 2 ** layer, cols / 2 ** layer, dim) assert_array_equal(out.shape, layer_shape) - # grayscale image + +def test_build_gaussian_pyramid_gray(): rows, cols = image_gray.shape pyramid = pyramids.pyramid_gaussian(image_gray, downscale=2) for layer, out in enumerate(pyramid): @@ -47,15 +47,15 @@ def test_build_gaussian_pyramid(): assert_array_equal(out.shape, layer_shape) -def test_build_laplacian_pyramid(): - # RGB image +def test_build_laplacian_pyramid_rgb(): rows, cols, dim = image.shape pyramid = pyramids.pyramid_laplacian(image, downscale=2) for layer, out in enumerate(pyramid): layer_shape = (rows / 2 ** layer, cols / 2 ** layer, dim) assert_array_equal(out.shape, layer_shape) - # grayscale image + +def test_build_laplacian_pyramid_gray(): rows, cols = image_gray.shape pyramid = pyramids.pyramid_laplacian(image_gray, downscale=2) for layer, out in enumerate(pyramid): From dc0d4eff74a019bd777e44892659c7b7da3fe56d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 9 Oct 2012 08:04:25 +0200 Subject: [PATCH 44/81] Add missing empty lines between test functions --- skimage/measure/tests/test_regionprops.py | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/skimage/measure/tests/test_regionprops.py b/skimage/measure/tests/test_regionprops.py index 524f55ee..6c7f5d46 100644 --- a/skimage/measure/tests/test_regionprops.py +++ b/skimage/measure/tests/test_regionprops.py @@ -46,6 +46,7 @@ def test_bbox(): bbox = regionprops(SAMPLE_mod, ['BoundingBox'])[0]['BoundingBox'] assert_array_almost_equal(bbox, (0, 0, SAMPLE.shape[0], SAMPLE.shape[1]-1)) + def test_central_moments(): mu = regionprops(SAMPLE, ['CentralMoments'])[0]['CentralMoments'] #: determined with OpenCV @@ -58,6 +59,7 @@ def test_central_moments(): assert_almost_equal(mu[2,1], 2000.296296296291) assert_almost_equal(mu[3,0], -760.0246913580195) + def test_centroid(): centroid = regionprops(SAMPLE, ['Centroid'])[0]['Centroid'] # determined with MATLAB @@ -208,6 +210,7 @@ def test_moments(): assert_almost_equal(m[2,1], 43882.0) assert_almost_equal(m[3,0], 95588.0) + def test_normalized_moments(): nu = regionprops(SAMPLE, ['NormalizedMoments'])[0]['NormalizedMoments'] #: determined with OpenCV @@ -218,6 +221,7 @@ def test_normalized_moments(): assert_almost_equal(nu[2,1], 0.045473992910668816) assert_almost_equal(nu[3,0], -0.017278118992041805) + def test_orientation(): orientation = regionprops(SAMPLE, ['Orientation'])[0]['Orientation'] # determined with MATLAB @@ -239,6 +243,7 @@ def test_orientation(): )[0]['Orientation'] assert_almost_equal(orientation_diag, -math.pi / 4) + def test_perimeter(): per = regionprops(SAMPLE, ['Perimeter'])[0]['Perimeter'] assert_almost_equal(per, 59.2132034355964) @@ -246,11 +251,13 @@ def test_perimeter(): per = perimeter(SAMPLE, neighbourhood=8) assert_almost_equal(per, 43.1213203436) + def test_solidity(): solidity = regionprops(SAMPLE, ['Solidity'])[0]['Solidity'] # determined with MATLAB assert_almost_equal(solidity, 0.580645161290323) + def test_weighted_central_moments(): wmu = regionprops(SAMPLE, ['WeightedCentralMoments'], INTENSITY_SAMPLE )[0]['WeightedCentralMoments'] @@ -304,6 +311,7 @@ def test_weighted_moments(): ) assert_array_almost_equal(wm, ref) + def test_weighted_normalized_moments(): wnu = regionprops(SAMPLE, ['WeightedNormalizedMoments'], INTENSITY_SAMPLE )[0]['WeightedNormalizedMoments'] @@ -315,6 +323,7 @@ def test_weighted_normalized_moments(): ) assert_array_almost_equal(wnu, ref) + if __name__ == "__main__": from numpy.testing import run_module_suite run_module_suite() From be9dcdf195da34ffae5f8068e537ad3b3490e362 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 8 Oct 2012 23:57:44 -0700 Subject: [PATCH 45/81] DOC: Fix pip command. --- doc/source/install.txt | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/doc/source/install.txt b/doc/source/install.txt index 81652ab1..7c886549 100644 --- a/doc/source/install.txt +++ b/doc/source/install.txt @@ -1,8 +1,6 @@ Pre-built installation ---------------------- -.. !! Also update scikit-image-web !! - `Windows binaries `__ are kindly provided by Christoph Gohlke. @@ -23,7 +21,7 @@ or :: - pip -U scikit-image + pip install -U scikit-image Installation from source ------------------------ From b6b2eb708c87c3a961cb78c6c24e18c700c1fa22 Mon Sep 17 00:00:00 2001 From: Tony S Yu Date: Mon, 8 Oct 2012 20:30:33 -0400 Subject: [PATCH 46/81] DOC: Add imports to doctests to fix errors --- skimage/morphology/grey.py | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/skimage/morphology/grey.py b/skimage/morphology/grey.py index e7e52de4..45d11729 100644 --- a/skimage/morphology/grey.py +++ b/skimage/morphology/grey.py @@ -45,6 +45,7 @@ def erosion(image, selem, out=None, shift_x=False, shift_y=False): Examples -------- >>> # Erosion shrinks bright regions + >>> import numpy as np >>> from skimage.morphology import square >>> bright_square = np.array([[0, 0, 0, 0, 0], ... [0, 1, 1, 1, 0], @@ -97,6 +98,7 @@ def dilation(image, selem, out=None, shift_x=False, shift_y=False): Examples -------- >>> # Dilation enlarges bright regions + >>> import numpy as np >>> from skimage.morphology import square >>> bright_pixel = np.array([[0, 0, 0, 0, 0], ... [0, 0, 0, 0, 0], @@ -146,6 +148,7 @@ def opening(image, selem, out=None): Examples -------- >>> # Open up gap between two bright regions (but also shrink regions) + >>> import numpy as np >>> from skimage.morphology import square >>> bad_connection = np.array([[1, 0, 0, 0, 1], ... [1, 1, 0, 1, 1], @@ -196,6 +199,7 @@ def closing(image, selem, out=None): Examples -------- >>> # Close a gap between two bright lines + >>> import numpy as np >>> from skimage.morphology import square >>> broken_line = np.array([[0, 0, 0, 0, 0], ... [0, 0, 0, 0, 0], @@ -245,6 +249,7 @@ def white_tophat(image, selem, out=None): Examples -------- >>> # Subtract grey background from bright peak + >>> import numpy as np >>> from skimage.morphology import square >>> bright_on_grey = np.array([[2, 3, 3, 3, 2], ... [3, 4, 5, 4, 3], @@ -294,6 +299,7 @@ def black_tophat(image, selem, out=None): Examples -------- >>> # Change dark peak to bright peak and subtract background + >>> import numpy as np >>> from skimage.morphology import square >>> dark_on_grey = np.array([[7, 6, 6, 6, 7], ... [6, 5, 4, 5, 6], From 3b67c8204255757391b3a4f76e4cc778a6ad5072 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sun, 2 Sep 2012 22:54:24 +0200 Subject: [PATCH 47/81] Add support for 3-dimensional image resizing --- skimage/transform/_warps.py | 49 ++++++++++++++++++++------- skimage/transform/tests/test_warps.py | 34 ++++++++++++++++++- 2 files changed, 70 insertions(+), 13 deletions(-) diff --git a/skimage/transform/_warps.py b/skimage/transform/_warps.py index 71bc41b8..bde13f3d 100644 --- a/skimage/transform/_warps.py +++ b/skimage/transform/_warps.py @@ -1,4 +1,5 @@ import numpy as np +from scipy import ndimage from ._geometric import (warp, SimilarityTransform, AffineTransform, ProjectiveTransform) @@ -11,7 +12,10 @@ def resize(image, output_shape, order=1, mode='constant', cval=0.): image : ndarray Input image. output_shape : tuple or ndarray - Size of the generated output image `(rows, cols)`. + Size of the generated output image `(rows, cols[, dim])`. If `dim` is + not provided, the number of channels are preserved. In case the number + of input channels does not equal the number of output channels a + 3-dimensional interpolation is applied. Returns ------- @@ -32,24 +36,45 @@ def resize(image, output_shape, order=1, mode='constant', cval=0.): """ - rows, cols = output_shape + rows, cols = output_shape[0], output_shape[1] orig_rows, orig_cols = image.shape[0], image.shape[1] row_scale = float(orig_rows) / rows col_scale = float(orig_cols) / cols - # 3 control points necessary to estimate exact AffineTransform - src_corners = np.array([[1, 1], [1, rows], [cols, rows]]) - 1 - dst_corners = np.zeros(src_corners.shape, dtype=np.double) - # take into account that 0th pixel is at position (0.5, 0.5) - dst_corners[:, 0] = col_scale * (src_corners[:, 0] + 0.5) - 0.5 - dst_corners[:, 1] = row_scale * (src_corners[:, 1] + 0.5) - 0.5 + # 3-dimensional interpolation + if len(output_shape) == 3 and (image.ndim == 2 + or output_shape[2] != image.shape[2]): + dim = output_shape[2] + orig_dim = 1 if image.ndim == 2 else image.shape[2] + dim_scale = float(orig_dim) / dim - tform = AffineTransform() - tform.estimate(src_corners, dst_corners) + map_rows, map_cols, map_dims = np.mgrid[:rows, :cols, :dim] + map_rows = row_scale * (map_rows + 0.5) - 0.5 + map_cols = col_scale * (map_cols + 0.5) - 0.5 + map_dims = dim_scale * (map_dims + 0.5) - 0.5 - return warp(image, tform, output_shape=output_shape, order=order, - mode=mode, cval=cval) + coord_map = np.array([map_rows, map_cols, map_dims]) + + out = ndimage.map_coordinates(image, coord_map, order=order, mode=mode, + cval=cval) + + else: # 2-dimensional interpolation + + # 3 control points necessary to estimate exact AffineTransform + src_corners = np.array([[1, 1], [1, rows], [cols, rows]]) - 1 + dst_corners = np.zeros(src_corners.shape, dtype=np.double) + # take into account that 0th pixel is at position (0.5, 0.5) + dst_corners[:, 0] = col_scale * (src_corners[:, 0] + 0.5) - 0.5 + dst_corners[:, 1] = row_scale * (src_corners[:, 1] + 0.5) - 0.5 + + tform = AffineTransform() + tform.estimate(src_corners, dst_corners) + + out = warp(image, tform, output_shape=output_shape, order=order, + mode=mode, cval=cval) + + return out def rescale(image, scale, order=1, mode='constant', cval=0.): diff --git a/skimage/transform/tests/test_warps.py b/skimage/transform/tests/test_warps.py index 69980b25..e40d2bf0 100644 --- a/skimage/transform/tests/test_warps.py +++ b/skimage/transform/tests/test_warps.py @@ -85,7 +85,7 @@ def test_rotate(): assert_array_almost_equal(x90, np.rot90(x)) -def test_resize(): +def test_resize2d(): x = np.zeros((5, 5), dtype=np.double) x[1, 1] = 1 resized = resize(x, (10, 10), order=0) @@ -112,6 +112,38 @@ def test_scale(): assert_array_almost_equal(scaled, ref) +def test_resize3d(): + # keep 3rd dimension + x = np.zeros((5, 5, 3), dtype=np.double) + x[1, 1, :] = 1 + resized = resize(x, (10, 10), order=0) + ref = np.zeros((10, 10, 3)) + ref[2:4, 2:4, :] = 1 + assert_array_almost_equal(resized, ref) + resized = resize(x, (10, 10, 3), order=0) + assert_array_almost_equal(resized, ref) + + # resize 3rd dimension + x = np.zeros((5, 5, 3), dtype=np.double) + x[1, 1, :] = 1 + resized = resize(x, (10, 10, 1), order=0) + ref = np.zeros((10, 10, 1)) + ref[2:4, 2:4] = 1 + assert_array_almost_equal(resized, ref) + + # bilinear 3rd dimension + x = np.zeros((5, 5, 2), dtype=np.double) + x[1, 1, 0] = 0 + x[1, 1, 1] = 1 + resized = resize(x, (10, 10, 1), order=1) + ref = np.zeros((10, 10, 1)) + ref[1:5, 1:5, :] = 0.03125 + ref[1:5, 2:4, :] = 0.09375 + ref[2:4, 1:5, :] = 0.09375 + ref[2:4, 2:4, :] = 0.28125 + assert_array_almost_equal(resized, ref) + + def test_swirl(): image = img_as_float(data.checkerboard()) From 0856dad9889d76768e8b2d452af88db9259cc5d3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 9 Oct 2012 11:19:27 +0200 Subject: [PATCH 48/81] Split 3d resize test function --- skimage/transform/_warps.py | 3 +++ skimage/transform/tests/test_warps.py | 26 +++++++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/skimage/transform/_warps.py b/skimage/transform/_warps.py index bde13f3d..6689430b 100644 --- a/skimage/transform/_warps.py +++ b/skimage/transform/_warps.py @@ -348,3 +348,6 @@ def homography(image, H, output_shape=None, order=1, tform = ProjectiveTransform(H) return warp(image, inverse_map=tform.inverse, output_shape=output_shape, order=order, mode=mode, cval=cval) + + return warp(image, inverse_map=tform.inverse, output_shape=output_shape, + order=order, mode=mode, cval=cval) diff --git a/skimage/transform/tests/test_warps.py b/skimage/transform/tests/test_warps.py index e40d2bf0..1993f932 100644 --- a/skimage/transform/tests/test_warps.py +++ b/skimage/transform/tests/test_warps.py @@ -85,16 +85,7 @@ def test_rotate(): assert_array_almost_equal(x90, np.rot90(x)) -def test_resize2d(): - x = np.zeros((5, 5), dtype=np.double) - x[1, 1] = 1 - resized = resize(x, (10, 10), order=0) - ref = np.zeros((10, 10)) - ref[2:4, 2:4] = 1 - assert_array_almost_equal(resized, ref) - - -def test_scale(): +def test_rescale(): # same scale factor x = np.zeros((5, 5), dtype=np.double) x[1, 1] = 1 @@ -112,7 +103,16 @@ def test_scale(): assert_array_almost_equal(scaled, ref) -def test_resize3d(): +def test_resize2d(): + x = np.zeros((5, 5), dtype=np.double) + x[1, 1] = 1 + resized = resize(x, (10, 10), order=0) + ref = np.zeros((10, 10)) + ref[2:4, 2:4] = 1 + assert_array_almost_equal(resized, ref) + + +def test_resize3d_keep(): # keep 3rd dimension x = np.zeros((5, 5, 3), dtype=np.double) x[1, 1, :] = 1 @@ -123,6 +123,8 @@ def test_resize3d(): resized = resize(x, (10, 10, 3), order=0) assert_array_almost_equal(resized, ref) + +def test_resize3d_resize(): # resize 3rd dimension x = np.zeros((5, 5, 3), dtype=np.double) x[1, 1, :] = 1 @@ -131,6 +133,8 @@ def test_resize3d(): ref[2:4, 2:4] = 1 assert_array_almost_equal(resized, ref) + +def test_resize3d_bilinear(): # bilinear 3rd dimension x = np.zeros((5, 5, 2), dtype=np.double) x[1, 1, 0] = 0 From 7741d906ed1bb5f827f1166e63993ed379c00ea9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 10 Oct 2012 09:09:52 +0200 Subject: [PATCH 49/81] Fix failing perimeter test caused by bug in scipy --- skimage/measure/tests/test_regionprops.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/measure/tests/test_regionprops.py b/skimage/measure/tests/test_regionprops.py index 6c7f5d46..bd23d8b3 100644 --- a/skimage/measure/tests/test_regionprops.py +++ b/skimage/measure/tests/test_regionprops.py @@ -248,7 +248,7 @@ def test_perimeter(): per = regionprops(SAMPLE, ['Perimeter'])[0]['Perimeter'] assert_almost_equal(per, 59.2132034355964) - per = perimeter(SAMPLE, neighbourhood=8) + per = perimeter(SAMPLE.astype('double'), neighbourhood=8) assert_almost_equal(per, 43.1213203436) From f22a014ffaa07856e33a5bda678d87673fefb3f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 12 Oct 2012 19:10:46 +0200 Subject: [PATCH 50/81] Add scharr edge filter --- skimage/filter/__init__.py | 3 +- skimage/filter/edges.py | 114 +++++++++++++++++++++++++-- skimage/filter/tests/test_edges.py | 120 +++++++++++++++++++++++++++++ 3 files changed, 228 insertions(+), 9 deletions(-) diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py index bdbbb531..f76556df 100644 --- a/skimage/filter/__init__.py +++ b/skimage/filter/__init__.py @@ -1,7 +1,8 @@ from .lpi_filter import * from .ctmf import median_filter from ._canny import canny -from .edges import sobel, hsobel, vsobel, hprewitt, vprewitt, prewitt +from .edges import (sobel, hsobel, vsobel, scharr, hscharr, vscharr, prewitt, + hprewitt, vprewitt) from ._tv_denoise import tv_denoise from ._rank_order import rank_order from .thresholding import threshold_otsu, threshold_adaptive diff --git a/skimage/filter/edges.py b/skimage/filter/edges.py index 134aa796..98e4f600 100644 --- a/skimage/filter/edges.py +++ b/skimage/filter/edges.py @@ -1,6 +1,7 @@ -"""edges.py - Sobel edge filter +"""edges.py - Edge filters -Originally part of CellProfiler, code licensed under both GPL and BSD licenses. +Sobel and Prewitt filters originally part of CellProfiler, code licensed under +both GPL and BSD licenses. Website: http://www.cellprofiler.org Copyright (c) 2003-2009 Massachusetts Institute of Technology Copyright (c) 2009-2011 Broad Institute @@ -48,7 +49,7 @@ def sobel(image, mask=None): Returns ------- output : ndarray - The Sobel edge map. + The Sobel edge map. Notes ----- @@ -77,7 +78,7 @@ def hsobel(image, mask=None): Returns ------- output : ndarray - The Sobel edge map. + The Sobel edge map. Notes ----- @@ -112,7 +113,7 @@ def vsobel(image, mask=None): Returns ------- output : ndarray - The Sobel edge map. + The Sobel edge map. Notes ----- @@ -132,6 +133,103 @@ def vsobel(image, mask=None): return _mask_filter_result(result, mask) +def scharr(image, mask=None): + """Calculate the absolute magnitude Scharr to find edges. + + Parameters + ---------- + image : array_like, dtype=float + Image to process. + mask : array_like, dtype=bool, optional + An optional mask to limit the application to a certain area. + Note that pixels surrounding masked regions are also masked to + prevent masked regions from affecting the result. + + Returns + ------- + output : ndarray + The Scharr edge map. + + Notes + ----- + Take the square root of the sum of the squares of the horizontal and + vertical Scharrs to get a magnitude that's somewhat insensitive to + direction. + + """ + return np.sqrt(hscharr(image, mask)**2 + vscharr(image, mask)**2) + + +def hscharr(image, mask=None): + """Find the horizontal edges of an image using the Scharr transform. + + Parameters + ---------- + image : array_like, dtype=float + Image to process. + mask : array_like, dtype=bool, optional + An optional mask to limit the application to a certain area. + Note that pixels surrounding masked regions are also masked to + prevent masked regions from affecting the result. + + Returns + ------- + output : ndarray + The Scharr edge map. + + Notes + ----- + We use the following kernel and return the absolute value of the + result at each point:: + + 3 10 3 + 0 0 0 + -3 -10 -3 + + """ + image = img_as_float(image) + result = np.abs(convolve(image, + np.array([[ 3, 10, 3], + [ 0, 0, 0], + [-3, -10, -3]]).astype(float) / 16.0)) + return _mask_filter_result(result, mask) + + +def vscharr(image, mask=None): + """Find the vertical edges of an image using the Scharr transform. + + Parameters + ---------- + image : array_like, dtype=float + Image to process + mask : array_like, dtype=bool, optional + An optional mask to limit the application to a certain area + Note that pixels surrounding masked regions are also masked to + prevent masked regions from affecting the result. + + Returns + ------- + output : ndarray + The Scharr edge map. + + Notes + ----- + We use the following kernel and return the absolute value of the + result at each point:: + + 3 0 -3 + 10 0 -10 + 3 0 -3 + + """ + image = img_as_float(image) + result = np.abs(convolve(image, + np.array([[ 3, 0, -3], + [10, 0, -10], + [ 3, 0, -3]]).astype(float) / 16.0)) + return _mask_filter_result(result, mask) + + def prewitt(image, mask=None): """Find the edge magnitude using the Prewitt transform. @@ -147,7 +245,7 @@ def prewitt(image, mask=None): Returns ------- output : ndarray - The Prewitt edge map. + The Prewitt edge map. Notes ----- @@ -172,7 +270,7 @@ def hprewitt(image, mask=None): Returns ------- output : ndarray - The Prewitt edge map. + The Prewitt edge map. Notes ----- @@ -207,7 +305,7 @@ def vprewitt(image, mask=None): Returns ------- output : ndarray - The Prewitt edge map. + The Prewitt edge map. Notes ----- diff --git a/skimage/filter/tests/test_edges.py b/skimage/filter/tests/test_edges.py index a5d52aa5..1edf8914 100644 --- a/skimage/filter/tests/test_edges.py +++ b/skimage/filter/tests/test_edges.py @@ -9,6 +9,7 @@ def test_sobel_zeros(): result = F.sobel(np.zeros((10, 10)), np.ones((10, 10), bool)) assert (np.all(result == 0)) + def test_sobel_mask(): """Sobel on a masked array should be zero""" np.random.seed(0) @@ -16,6 +17,7 @@ def test_sobel_mask(): np.zeros((10, 10), bool)) assert (np.all(result == 0)) + def test_sobel_horizontal(): """Sobel on an edge should be a horizontal line""" i, j = np.mgrid[-5:6, -5:6] @@ -26,6 +28,7 @@ def test_sobel_horizontal(): assert (np.all(result[i == 0] == 1)) assert (np.all(result[np.abs(i) > 1] == 0)) + def test_sobel_vertical(): """Sobel on a vertical edge should be a vertical line""" i, j = np.mgrid[-5:6, -5:6] @@ -41,6 +44,7 @@ def test_hsobel_zeros(): result = F.hsobel(np.zeros((10, 10)), np.ones((10, 10), bool)) assert (np.all(result == 0)) + def test_hsobel_mask(): """Horizontal Sobel on a masked array should be zero""" np.random.seed(0) @@ -48,6 +52,7 @@ def test_hsobel_mask(): np.zeros((10, 10), bool)) assert (np.all(result == 0)) + def test_hsobel_horizontal(): """Horizontal Sobel on an edge should be a horizontal line""" i, j = np.mgrid[-5:6, -5:6] @@ -58,6 +63,7 @@ def test_hsobel_horizontal(): assert (np.all(result[i == 0] == 1)) assert (np.all(result[np.abs(i) > 1] == 0)) + def test_hsobel_vertical(): """Horizontal Sobel on a vertical edge should be zero""" i, j = np.mgrid[-5:6, -5:6] @@ -71,6 +77,7 @@ def test_vsobel_zeros(): result = F.vsobel(np.zeros((10, 10)), np.ones((10, 10), bool)) assert (np.all(result == 0)) + def test_vsobel_mask(): """Vertical Sobel on a masked array should be zero""" np.random.seed(0) @@ -78,6 +85,7 @@ def test_vsobel_mask(): np.zeros((10, 10), bool)) assert (np.all(result == 0)) + def test_vsobel_vertical(): """Vertical Sobel on an edge should be a vertical line""" i, j = np.mgrid[-5:6, -5:6] @@ -88,6 +96,7 @@ def test_vsobel_vertical(): assert (np.all(result[j == 0] == 1)) assert (np.all(result[np.abs(j) > 1] == 0)) + def test_vsobel_horizontal(): """vertical Sobel on a horizontal edge should be zero""" i, j = np.mgrid[-5:6, -5:6] @@ -97,11 +106,114 @@ def test_vsobel_horizontal(): assert (np.all(np.abs(result) < eps)) +def test_scharr_zeros(): + """Sobel on an array of all zeros""" + result = F.scharr(np.zeros((10, 10)), np.ones((10, 10), bool)) + assert (np.all(result == 0)) + + +def test_scharr_mask(): + """Sobel on a masked array should be zero""" + np.random.seed(0) + result = F.scharr(np.random.uniform(size=(10, 10)), + np.zeros((10, 10), bool)) + assert (np.all(result == 0)) + + +def test_scharr_horizontal(): + """Sobel on an edge should be a horizontal line""" + i, j = np.mgrid[-5:6, -5:6] + image = (i >= 0).astype(float) + result = F.scharr(image) + # Fudge the eroded points + i[np.abs(j) == 5] = 10000 + assert (np.all(result[i == 0] == 1)) + assert (np.all(result[np.abs(i) > 1] == 0)) + + +def test_scharr_vertical(): + """Sobel on a vertical edge should be a vertical line""" + i, j = np.mgrid[-5:6, -5:6] + image = (j >= 0).astype(float) + result = F.scharr(image) + j[np.abs(i) == 5] = 10000 + assert (np.all(result[j == 0] == 1)) + assert (np.all(result[np.abs(j) > 1] == 0)) + + +def test_hscharr_zeros(): + """Horizontal sobel on an array of all zeros""" + result = F.hscharr(np.zeros((10, 10)), np.ones((10, 10), bool)) + assert (np.all(result == 0)) + + +def test_hscharr_mask(): + """Horizontal Sobel on a masked array should be zero""" + np.random.seed(0) + result = F.hscharr(np.random.uniform(size=(10, 10)), + np.zeros((10, 10), bool)) + assert (np.all(result == 0)) + + +def test_hscharr_horizontal(): + """Horizontal Sobel on an edge should be a horizontal line""" + i, j = np.mgrid[-5:6, -5:6] + image = (i >= 0).astype(float) + result = F.hscharr(image) + # Fudge the eroded points + i[np.abs(j) == 5] = 10000 + assert (np.all(result[i == 0] == 1)) + assert (np.all(result[np.abs(i) > 1] == 0)) + + +def test_hscharr_vertical(): + """Horizontal Sobel on a vertical edge should be zero""" + i, j = np.mgrid[-5:6, -5:6] + image = (j >= 0).astype(float) + result = F.hscharr(image) + assert (np.all(result == 0)) + + +def test_vscharr_zeros(): + """Vertical sobel on an array of all zeros""" + result = F.vscharr(np.zeros((10, 10)), np.ones((10, 10), bool)) + assert (np.all(result == 0)) + + +def test_vscharr_mask(): + """Vertical Sobel on a masked array should be zero""" + np.random.seed(0) + result = F.vscharr(np.random.uniform(size=(10, 10)), + np.zeros((10, 10), bool)) + assert (np.all(result == 0)) + + +def test_vscharr_vertical(): + """Vertical Sobel on an edge should be a vertical line""" + i, j = np.mgrid[-5:6, -5:6] + image = (j >= 0).astype(float) + result = F.vscharr(image) + # Fudge the eroded points + j[np.abs(i) == 5] = 10000 + assert (np.all(result[j == 0] == 1)) + assert (np.all(result[np.abs(j) > 1] == 0)) + + +def test_vscharr_horizontal(): + """vertical Sobel on a horizontal edge should be zero""" + i, j = np.mgrid[-5:6, -5:6] + image = (i >= 0).astype(float) + result = F.vscharr(image) + eps = .000001 + assert (np.all(np.abs(result) < eps)) + + def test_prewitt_zeros(): """Prewitt on an array of all zeros""" result = F.prewitt(np.zeros((10, 10)), np.ones((10, 10), bool)) assert (np.all(result == 0)) + def test_prewitt_mask(): """Prewitt on a masked array should be zero""" np.random.seed(0) @@ -110,6 +222,7 @@ def test_prewitt_mask(): eps = .000001 assert (np.all(np.abs(result) < eps)) + def test_prewitt_horizontal(): """Prewitt on an edge should be a horizontal line""" i, j = np.mgrid[-5:6, -5:6] @@ -121,6 +234,7 @@ def test_prewitt_horizontal(): assert (np.all(result[i == 0] == 1)) assert (np.all(np.abs(result[np.abs(i) > 1]) < eps)) + def test_prewitt_vertical(): """Prewitt on a vertical edge should be a vertical line""" i, j = np.mgrid[-5:6, -5:6] @@ -137,6 +251,7 @@ def test_hprewitt_zeros(): result = F.hprewitt(np.zeros((10, 10)), np.ones((10, 10), bool)) assert (np.all(result == 0)) + def test_hprewitt_mask(): """Horizontal prewitt on a masked array should be zero""" np.random.seed(0) @@ -145,6 +260,7 @@ def test_hprewitt_mask(): eps = .000001 assert (np.all(np.abs(result) < eps)) + def test_hprewitt_horizontal(): """Horizontal prewitt on an edge should be a horizontal line""" i, j = np.mgrid[-5:6, -5:6] @@ -156,6 +272,7 @@ def test_hprewitt_horizontal(): assert (np.all(result[i == 0] == 1)) assert (np.all(np.abs(result[np.abs(i) > 1]) < eps)) + def test_hprewitt_vertical(): """Horizontal prewitt on a vertical edge should be zero""" i, j = np.mgrid[-5:6, -5:6] @@ -170,6 +287,7 @@ def test_vprewitt_zeros(): result = F.vprewitt(np.zeros((10, 10)), np.ones((10, 10), bool)) assert (np.all(result == 0)) + def test_vprewitt_mask(): """Vertical prewitt on a masked array should be zero""" np.random.seed(0) @@ -177,6 +295,7 @@ def test_vprewitt_mask(): np.zeros((10, 10), bool)) assert (np.all(result == 0)) + def test_vprewitt_vertical(): """Vertical prewitt on an edge should be a vertical line""" i, j = np.mgrid[-5:6, -5:6] @@ -188,6 +307,7 @@ def test_vprewitt_vertical(): eps = .000001 assert (np.all(np.abs(result[np.abs(j) > 1]) < eps)) + def test_vprewitt_horizontal(): """Vertical prewitt on a horizontal edge should be zero""" i, j = np.mgrid[-5:6, -5:6] From 04f21c58419f2937d3a4eb6c975617ec5c140393 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 12 Oct 2012 19:16:04 +0200 Subject: [PATCH 51/81] Fix dtype and dim note for parameters in doc strings --- skimage/filter/edges.py | 36 ++++++++++++++++++------------------ 1 file changed, 18 insertions(+), 18 deletions(-) diff --git a/skimage/filter/edges.py b/skimage/filter/edges.py index 98e4f600..fa11c69c 100644 --- a/skimage/filter/edges.py +++ b/skimage/filter/edges.py @@ -39,9 +39,9 @@ def sobel(image, mask=None): Parameters ---------- - image : array_like, dtype=float + image : 2-D array Image to process. - mask : array_like, dtype=bool, optional + mask : 2-D array, optional An optional mask to limit the application to a certain area. Note that pixels surrounding masked regions are also masked to prevent masked regions from affecting the result. @@ -68,9 +68,9 @@ def hsobel(image, mask=None): Parameters ---------- - image : array_like, dtype=float + image : 2-D array Image to process. - mask : array_like, dtype=bool, optional + mask : 2-D array, optional An optional mask to limit the application to a certain area. Note that pixels surrounding masked regions are also masked to prevent masked regions from affecting the result. @@ -103,9 +103,9 @@ def vsobel(image, mask=None): Parameters ---------- - image : array_like, dtype=float + image : 2-D array Image to process - mask : array_like, dtype=bool, optional + mask : 2-D array, optional An optional mask to limit the application to a certain area Note that pixels surrounding masked regions are also masked to prevent masked regions from affecting the result. @@ -138,9 +138,9 @@ def scharr(image, mask=None): Parameters ---------- - image : array_like, dtype=float + image : 2-D array Image to process. - mask : array_like, dtype=bool, optional + mask : 2-D array, optional An optional mask to limit the application to a certain area. Note that pixels surrounding masked regions are also masked to prevent masked regions from affecting the result. @@ -165,9 +165,9 @@ def hscharr(image, mask=None): Parameters ---------- - image : array_like, dtype=float + image : 2-D array Image to process. - mask : array_like, dtype=bool, optional + mask : 2-D array, optional An optional mask to limit the application to a certain area. Note that pixels surrounding masked regions are also masked to prevent masked regions from affecting the result. @@ -200,9 +200,9 @@ def vscharr(image, mask=None): Parameters ---------- - image : array_like, dtype=float + image : 2-D array Image to process - mask : array_like, dtype=bool, optional + mask : 2-D array, optional An optional mask to limit the application to a certain area Note that pixels surrounding masked regions are also masked to prevent masked regions from affecting the result. @@ -235,9 +235,9 @@ def prewitt(image, mask=None): Parameters ---------- - image : array_like, dtype=float + image : 2-D array Image to process. - mask : array_like, dtype=bool, optional + mask : 2-D array, optional An optional mask to limit the application to a certain area. Note that pixels surrounding masked regions are also masked to prevent masked regions from affecting the result. @@ -260,9 +260,9 @@ def hprewitt(image, mask=None): Parameters ---------- - image : array_like, dtype=float + image : 2-D array Image to process. - mask : array_like, dtype=bool, optional + mask : 2-D array, optional An optional mask to limit the application to a certain area. Note that pixels surrounding masked regions are also masked to prevent masked regions from affecting the result. @@ -295,9 +295,9 @@ def vprewitt(image, mask=None): Parameters ---------- - image : array_like, dtype=float + image : 2-D array Image to process. - mask : array_like, dtype=bool, optional + mask : 2-D array, optional An optional mask to limit the application to a certain area. Note that pixels surrounding masked regions are also masked to prevent masked regions from affecting the result. From fbaa883724a2b5a90d92d509bde2d7cf5a51e0ad Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 12 Oct 2012 19:32:53 +0200 Subject: [PATCH 52/81] Fix reference links in doc strings --- skimage/transform/pyramids.py | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/skimage/transform/pyramids.py b/skimage/transform/pyramids.py index ccace457..19001de8 100644 --- a/skimage/transform/pyramids.py +++ b/skimage/transform/pyramids.py @@ -57,7 +57,7 @@ def pyramid_reduce(image, downscale=2, sigma=None, order=1, References ---------- - ..[1] http://web.mit.edu/persci/people/adelson/pub_pdfs/pyramid83.pdf + .. [1] http://web.mit.edu/persci/people/adelson/pub_pdfs/pyramid83.pdf """ @@ -111,7 +111,7 @@ def pyramid_expand(image, upscale=2, sigma=None, order=1, References ---------- - ..[1] http://web.mit.edu/persci/people/adelson/pub_pdfs/pyramid83.pdf + .. [1] http://web.mit.edu/persci/people/adelson/pub_pdfs/pyramid83.pdf """ @@ -176,7 +176,7 @@ def pyramid_gaussian(image, max_layer=-1, downscale=2, sigma=None, order=1, References ---------- - ..[1] http://web.mit.edu/persci/people/adelson/pub_pdfs/pyramid83.pdf + .. [1] http://web.mit.edu/persci/people/adelson/pub_pdfs/pyramid83.pdf """ @@ -257,8 +257,8 @@ def pyramid_laplacian(image, max_layer=-1, downscale=2, sigma=None, order=1, References ---------- - ..[1] http://web.mit.edu/persci/people/adelson/pub_pdfs/pyramid83.pdf - ..[2] http://sepwww.stanford.edu/~morgan/texturematch/paper_html/node3.html + .. [1] http://web.mit.edu/persci/people/adelson/pub_pdfs/pyramid83.pdf + .. [2] http://sepwww.stanford.edu/~morgan/texturematch/paper_html/node3.html """ From 1fbd664d5bad1bc17ff6b856478f05e1215cbf29 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 13 Oct 2012 09:17:34 +0200 Subject: [PATCH 53/81] Add reference for scharr operator --- skimage/filter/edges.py | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/skimage/filter/edges.py b/skimage/filter/edges.py index fa11c69c..f11ae33a 100644 --- a/skimage/filter/edges.py +++ b/skimage/filter/edges.py @@ -156,6 +156,11 @@ def scharr(image, mask=None): vertical Scharrs to get a magnitude that's somewhat insensitive to direction. + References + ---------- + .. [1] D. Kroon, 2009, Short Paper University Twente, Numerical Optimization + of Kernel Based Image Derivatives. + """ return np.sqrt(hscharr(image, mask)**2 + vscharr(image, mask)**2) @@ -186,6 +191,11 @@ def hscharr(image, mask=None): 0 0 0 -3 -10 -3 + References + ---------- + .. [1] D. Kroon, 2009, Short Paper University Twente, Numerical Optimization + of Kernel Based Image Derivatives. + """ image = img_as_float(image) result = np.abs(convolve(image, @@ -221,6 +231,11 @@ def vscharr(image, mask=None): 10 0 -10 3 0 -3 + References + ---------- + .. [1] D. Kroon, 2009, Short Paper University Twente, Numerical Optimization + of Kernel Based Image Derivatives. + """ image = img_as_float(image) result = np.abs(convolve(image, From be6f02bd3d8987323242475845ec0d4731205a7c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 13 Oct 2012 09:18:11 +0200 Subject: [PATCH 54/81] Fix stylistic indentation --- skimage/filter/edges.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/filter/edges.py b/skimage/filter/edges.py index f11ae33a..f374634e 100644 --- a/skimage/filter/edges.py +++ b/skimage/filter/edges.py @@ -239,9 +239,9 @@ def vscharr(image, mask=None): """ image = img_as_float(image) result = np.abs(convolve(image, - np.array([[ 3, 0, -3], + np.array([[ 3, 0, -3], [10, 0, -10], - [ 3, 0, -3]]).astype(float) / 16.0)) + [ 3, 0, -3]]).astype(float) / 16.0)) return _mask_filter_result(result, mask) From 37ccc805e9a37dd8ce50d60b29525e484fbe4990 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 13 Oct 2012 09:19:53 +0200 Subject: [PATCH 55/81] Fix test case doc strings --- skimage/filter/tests/test_edges.py | 24 ++++++++++++------------ 1 file changed, 12 insertions(+), 12 deletions(-) diff --git a/skimage/filter/tests/test_edges.py b/skimage/filter/tests/test_edges.py index 1edf8914..c16b953d 100644 --- a/skimage/filter/tests/test_edges.py +++ b/skimage/filter/tests/test_edges.py @@ -107,13 +107,13 @@ def test_vsobel_horizontal(): def test_scharr_zeros(): - """Sobel on an array of all zeros""" + """Scharr on an array of all zeros""" result = F.scharr(np.zeros((10, 10)), np.ones((10, 10), bool)) assert (np.all(result == 0)) def test_scharr_mask(): - """Sobel on a masked array should be zero""" + """Scharr on a masked array should be zero""" np.random.seed(0) result = F.scharr(np.random.uniform(size=(10, 10)), np.zeros((10, 10), bool)) @@ -121,7 +121,7 @@ def test_scharr_mask(): def test_scharr_horizontal(): - """Sobel on an edge should be a horizontal line""" + """Scharr on an edge should be a horizontal line""" i, j = np.mgrid[-5:6, -5:6] image = (i >= 0).astype(float) result = F.scharr(image) @@ -132,7 +132,7 @@ def test_scharr_horizontal(): def test_scharr_vertical(): - """Sobel on a vertical edge should be a vertical line""" + """Scharr on a vertical edge should be a vertical line""" i, j = np.mgrid[-5:6, -5:6] image = (j >= 0).astype(float) result = F.scharr(image) @@ -142,13 +142,13 @@ def test_scharr_vertical(): def test_hscharr_zeros(): - """Horizontal sobel on an array of all zeros""" + """Horizontal Scharr on an array of all zeros""" result = F.hscharr(np.zeros((10, 10)), np.ones((10, 10), bool)) assert (np.all(result == 0)) def test_hscharr_mask(): - """Horizontal Sobel on a masked array should be zero""" + """Horizontal Scharr on a masked array should be zero""" np.random.seed(0) result = F.hscharr(np.random.uniform(size=(10, 10)), np.zeros((10, 10), bool)) @@ -156,7 +156,7 @@ def test_hscharr_mask(): def test_hscharr_horizontal(): - """Horizontal Sobel on an edge should be a horizontal line""" + """Horizontal Scharr on an edge should be a horizontal line""" i, j = np.mgrid[-5:6, -5:6] image = (i >= 0).astype(float) result = F.hscharr(image) @@ -167,7 +167,7 @@ def test_hscharr_horizontal(): def test_hscharr_vertical(): - """Horizontal Sobel on a vertical edge should be zero""" + """Horizontal Scharr on a vertical edge should be zero""" i, j = np.mgrid[-5:6, -5:6] image = (j >= 0).astype(float) result = F.hscharr(image) @@ -175,13 +175,13 @@ def test_hscharr_vertical(): def test_vscharr_zeros(): - """Vertical sobel on an array of all zeros""" + """Vertical Scharr on an array of all zeros""" result = F.vscharr(np.zeros((10, 10)), np.ones((10, 10), bool)) assert (np.all(result == 0)) def test_vscharr_mask(): - """Vertical Sobel on a masked array should be zero""" + """Vertical Scharr on a masked array should be zero""" np.random.seed(0) result = F.vscharr(np.random.uniform(size=(10, 10)), np.zeros((10, 10), bool)) @@ -189,7 +189,7 @@ def test_vscharr_mask(): def test_vscharr_vertical(): - """Vertical Sobel on an edge should be a vertical line""" + """Vertical Scharr on an edge should be a vertical line""" i, j = np.mgrid[-5:6, -5:6] image = (j >= 0).astype(float) result = F.vscharr(image) @@ -200,7 +200,7 @@ def test_vscharr_vertical(): def test_vscharr_horizontal(): - """vertical Sobel on a horizontal edge should be zero""" + """vertical Scharr on a horizontal edge should be zero""" i, j = np.mgrid[-5:6, -5:6] image = (i >= 0).astype(float) result = F.vscharr(image) From 239026a19dd65770639a7f22a000961adcb9af14 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 13 Oct 2012 09:21:10 +0200 Subject: [PATCH 56/81] Add scharr filter to mask test cases --- skimage/filter/tests/test_edges.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/filter/tests/test_edges.py b/skimage/filter/tests/test_edges.py index c16b953d..628de16d 100644 --- a/skimage/filter/tests/test_edges.py +++ b/skimage/filter/tests/test_edges.py @@ -329,7 +329,7 @@ def test_horizontal_mask_line(): expected[1:-1, 1:-1] = 0.2 # constant gradient for most of image, expected[4:7, 1:-1] = 0 # but line and neighbors masked - for grad_func in (F.hprewitt, F.hsobel): + for grad_func in (F.hprewitt, F.hsobel, F.hscharr): result = grad_func(vgrad, mask) yield assert_close, result, expected @@ -346,7 +346,7 @@ def test_vertical_mask_line(): expected[1:-1, 1:-1] = 0.2 # constant gradient for most of image, expected[1:-1, 4:7] = 0 # but line and neighbors masked - for grad_func in (F.vprewitt, F.vsobel): + for grad_func in (F.vprewitt, F.vsobel, F.vscharr): result = grad_func(hgrad, mask) yield assert_close, result, expected From a8291352e42c7484e9afe9e7fb605a069fdf56da Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 17 Oct 2012 09:00:06 +0200 Subject: [PATCH 57/81] Improve description of scharr and sobel edge filters --- skimage/filter/edges.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/skimage/filter/edges.py b/skimage/filter/edges.py index f374634e..fcd9f548 100644 --- a/skimage/filter/edges.py +++ b/skimage/filter/edges.py @@ -35,7 +35,7 @@ def _mask_filter_result(result, mask): def sobel(image, mask=None): - """Calculate the absolute magnitude Sobel to find edges. + """Find the edge magnitude using the Sobel transform. Parameters ---------- @@ -134,7 +134,7 @@ def vsobel(image, mask=None): def scharr(image, mask=None): - """Calculate the absolute magnitude Scharr to find edges. + """Find the edge magnitude using the Scharr transform. Parameters ---------- From 120571b079788703d10905bbbfa0e57781d66ff0 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Mon, 15 Oct 2012 22:44:01 -0700 Subject: [PATCH 58/81] BUG: Allow RGB images to be passed to grey2rgb. --- skimage/color/colorconv.py | 13 ++++++++----- skimage/color/tests/test_colorconv.py | 7 +++++++ 2 files changed, 15 insertions(+), 5 deletions(-) diff --git a/skimage/color/colorconv.py b/skimage/color/colorconv.py index ec5551d6..2e7f9138 100644 --- a/skimage/color/colorconv.py +++ b/skimage/color/colorconv.py @@ -525,11 +525,14 @@ def gray2rgb(image): If the input is not 2-dimensional. """ - if image.ndim != 2: - raise ValueError('Gray-level image should be two-dimensional.') - - M, N = image.shape - return np.dstack((image, image, image)) + if image.ndim > 2: + return image + elif image.ndim == 2: + M, N = image.shape + return np.dstack((image, image, image)) + else: + raise ValueError('Gray-level image should be two-dimensional, ' + 'RGB or RGBA.') def xyz2lab(xyz): diff --git a/skimage/color/tests/test_colorconv.py b/skimage/color/tests/test_colorconv.py index 316d801a..1fc46b62 100644 --- a/skimage/color/tests/test_colorconv.py +++ b/skimage/color/tests/test_colorconv.py @@ -196,5 +196,12 @@ def test_gray2rgb(): assert_equal(z[..., 0], x) assert_equal(z[0, 1, :], [128, 128, 128]) + +def test_gray2rgb_rgb(): + x = np.random.random((5, 5, 4)) + y = gray2rgb(x) + assert_equal(x, y) + + if __name__ == "__main__": run_module_suite() From 4a0564a7697e6a0ff81163338ab3a28bdd6bddf2 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Tue, 16 Oct 2012 23:33:29 -0700 Subject: [PATCH 59/81] Add is_rgb and is_gray. --- skimage/color/colorconv.py | 51 +++++++++++++++++++-------- skimage/color/tests/test_colorconv.py | 16 +++++++-- 2 files changed, 51 insertions(+), 16 deletions(-) diff --git a/skimage/color/colorconv.py b/skimage/color/colorconv.py index 2e7f9138..38eab995 100644 --- a/skimage/color/colorconv.py +++ b/skimage/color/colorconv.py @@ -45,7 +45,7 @@ from __future__ import division __all__ = ['convert_colorspace', 'rgb2hsv', 'hsv2rgb', 'rgb2xyz', 'xyz2rgb', 'rgb2rgbcie', 'rgbcie2rgb', 'rgb2grey', 'rgb2gray', 'gray2rgb', - 'xyz2lab', 'lab2xyz', 'lab2rgb', 'rgb2lab' + 'xyz2lab', 'lab2xyz', 'lab2rgb', 'rgb2lab', 'is_rgb', 'is_gray' ] __docformat__ = "restructuredtext en" @@ -55,6 +55,31 @@ from scipy import linalg from ..util import dtype +def is_rgb(image): + """Test whether the image is RGB or RGBA. + + Parameters + ---------- + image : ndarray + Input image. + + """ + return (image.ndim == 3 and image.shape[2] in (3, 4)) + + +def is_gray(image): + """Test whether the image is gray (i.e. has only one color band). + + Parameters + ---------- + image : ndarray + Input image. + + """ + return image.ndim == 2 + + + def convert_colorspace(arr, fromspace, tospace): """Convert an image array to a new color space. @@ -281,7 +306,7 @@ rgbcie_from_rgb = np.dot(rgbcie_from_xyz, xyz_from_rgb) rgb_from_rgbcie = np.dot(rgb_from_xyz, xyz_from_rgbcie) -grey_from_rgb = np.array([[0.2125, 0.7154, 0.0721], +gray_from_rgb = np.array([[0.2125, 0.7154, 0.0721], [0, 0, 0], [0, 0, 0]]) @@ -458,7 +483,7 @@ def rgbcie2rgb(rgbcie): return _convert(rgb_from_rgbcie, rgbcie) -def rgb2grey(rgb): +def rgb2gray(rgb): """Compute luminance of an RGB image. Parameters @@ -475,7 +500,7 @@ def rgb2grey(rgb): Raises ------ ValueError - If `rgb2grey` is not a 3-D array of shape (.., .., 3) or + If `rgb2gray` is not a 3-D array of shape (.., .., 3) or (.., .., 4). References @@ -493,21 +518,21 @@ def rgb2grey(rgb): Examples -------- - >>> from skimage.color import rgb2grey + >>> from skimage.color import rgb2gray >>> from skimage import data >>> lena = data.lena() - >>> lena_grey = rgb2grey(lena) + >>> lena_gray = rgb2gray(lena) """ if rgb.ndim == 2: return rgb - return _convert(grey_from_rgb, rgb[:, :, :3])[..., 0] + return _convert(gray_from_rgb, rgb[:, :, :3])[..., 0] -rgb2gray = rgb2grey +rgb2grey = rgb2gray def gray2rgb(image): - """Create an RGB representation of a grey-level image. + """Create an RGB representation of a gray-level image. Parameters ---------- @@ -525,14 +550,12 @@ def gray2rgb(image): If the input is not 2-dimensional. """ - if image.ndim > 2: + if is_rgb(image): return image - elif image.ndim == 2: - M, N = image.shape + elif is_gray(image): return np.dstack((image, image, image)) else: - raise ValueError('Gray-level image should be two-dimensional, ' - 'RGB or RGBA.') + raise ValueError("Input image expected to be RGB, RGBA or gray.") def xyz2lab(xyz): diff --git a/skimage/color/tests/test_colorconv.py b/skimage/color/tests/test_colorconv.py index 1fc46b62..c09c9d22 100644 --- a/skimage/color/tests/test_colorconv.py +++ b/skimage/color/tests/test_colorconv.py @@ -25,10 +25,11 @@ from skimage.color import ( convert_colorspace, rgb2grey, gray2rgb, xyz2lab, lab2xyz, - lab2rgb, rgb2lab + lab2rgb, rgb2lab, + is_rgb, is_gray ) -from skimage import data_dir +from skimage import data_dir, data import colorsys @@ -203,5 +204,16 @@ def test_gray2rgb_rgb(): assert_equal(x, y) +def test_is_rgb(): + color = data.lena() + gray = data.camera() + + assert is_rgb(color) + assert not is_gray(color) + + assert is_gray(gray) + assert not is_gray(color) + + if __name__ == "__main__": run_module_suite() From b0807739efaa87e412d2c0d4a6efe3652e7acb13 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 5 Oct 2012 11:51:08 +0200 Subject: [PATCH 60/81] Use common file for denoising filters --- skimage/filter/__init__.py | 2 +- skimage/filter/{_tv_denoise.py => denoise.py} | 0 2 files changed, 1 insertion(+), 1 deletion(-) rename skimage/filter/{_tv_denoise.py => denoise.py} (100%) diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py index f76556df..dc5f9896 100644 --- a/skimage/filter/__init__.py +++ b/skimage/filter/__init__.py @@ -3,6 +3,6 @@ from .ctmf import median_filter from ._canny import canny from .edges import (sobel, hsobel, vsobel, scharr, hscharr, vscharr, prewitt, hprewitt, vprewitt) -from ._tv_denoise import tv_denoise +from .denoise import tv_denoise from ._rank_order import rank_order from .thresholding import threshold_otsu, threshold_adaptive diff --git a/skimage/filter/_tv_denoise.py b/skimage/filter/denoise.py similarity index 100% rename from skimage/filter/_tv_denoise.py rename to skimage/filter/denoise.py From 25867b9dd5f916ac22f60075c4206a4aa82b75e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 5 Oct 2012 11:55:27 +0200 Subject: [PATCH 61/81] Improve doc string format of TV denoise functions --- skimage/filter/denoise.py | 55 ++++++++++++++++----------------------- 1 file changed, 22 insertions(+), 33 deletions(-) diff --git a/skimage/filter/denoise.py b/skimage/filter/denoise.py index 3302319c..ae4d2f82 100644 --- a/skimage/filter/denoise.py +++ b/skimage/filter/denoise.py @@ -3,35 +3,32 @@ from skimage import img_as_float def _tv_denoise_3d(im, weight=100, eps=2.e-4, n_iter_max=200): - """ - Perform total-variation denoising on 3-D arrays + """Perform total-variation denoising on 3-D arrays. Parameters ---------- im: ndarray - 3-D input data to be denoised - + 3-D input data to be denoised. weight: float, optional - denoising weight. The greater ``weight``, the more denoising (at - the expense of fidelity to ``input``) - + Denoising weight. The greater ``weight``, the more denoising (at + the expense of fidelity to ``input``). eps: float, optional - relative difference of the value of the cost function that determines + Relative difference of the value of the cost function that determines the stop criterion. The algorithm stops when: (E_(n-1) - E_n) < eps * E_0 n_iter_max: int, optional - maximal number of iterations used for the optimization. + Maximal number of iterations used for the optimization. Returns ------- out: ndarray - denoised array of floats + Denoised array of floats. Notes ----- - Rudin, Osher and Fatemi algorithm + Rudin, Osher and Fatemi algorithm. Examples --------- @@ -86,43 +83,39 @@ def _tv_denoise_3d(im, weight=100, eps=2.e-4, n_iter_max=200): def _tv_denoise_2d(im, weight=50, eps=2.e-4, n_iter_max=200): - """ - Perform total-variation denoising + """Perform total-variation denoising. Parameters ---------- im: ndarray - input data to be denoised - + Input data to be denoised. weight: float, optional - denoising weight. The greater ``weight``, the more denoising (at + Denoising weight. The greater ``weight``, the more denoising (at the expense of fidelity to ``input``) - eps: float, optional - relative difference of the value of the cost function that determines + Relative difference of the value of the cost function that determines the stop criterion. The algorithm stops when: (E_(n-1) - E_n) < eps * E_0 n_iter_max: int, optional - maximal number of iterations used for the optimization. + Maximal number of iterations used for the optimization. Returns ------- out: ndarray - denoised array of floats + Denoised array of floats. Notes ----- The principle of total variation denoising is explained in - http://en.wikipedia.org/wiki/Total_variation_denoising + http://en.wikipedia.org/wiki/Total_variation_denoising. This code is an implementation of the algorithm of Rudin, Fatemi and Osher that was proposed by Chambolle in [1]_. References ---------- - .. [1] A. Chambolle, An algorithm for total variation minimization and applications, Journal of Mathematical Imaging and Vision, Springer, 2004, 20, 89-97. @@ -173,33 +166,30 @@ def _tv_denoise_2d(im, weight=50, eps=2.e-4, n_iter_max=200): def tv_denoise(im, weight=50, eps=2.e-4, n_iter_max=200): - """ - Perform total-variation denoising on 2-d and 3-d images + """Perform total-variation denoising on 2-d and 3-d images. Parameters ---------- im: ndarray (2d or 3d) of ints, uints or floats - input data to be denoised. `im` can be of any numeric type, + Input data to be denoised. `im` can be of any numeric type, but it is cast into an ndarray of floats for the computation of the denoised image. - weight: float, optional - denoising weight. The greater ``weight``, the more denoising (at - the expense of fidelity to ``input``) - + Denoising weight. The greater ``weight``, the more denoising (at + the expense of fidelity to ``input``). eps: float, optional - relative difference of the value of the cost function that + Relative difference of the value of the cost function that determines the stop criterion. The algorithm stops when: (E_(n-1) - E_n) < eps * E_0 n_iter_max: int, optional - maximal number of iterations used for the optimization. + Maximal number of iterations used for the optimization. Returns ------- out: ndarray - denoised array of floats + Denoised array of floats. Notes ----- @@ -217,7 +207,6 @@ def tv_denoise(im, weight=50, eps=2.e-4, n_iter_max=200): References ---------- - .. [1] A. Chambolle, An algorithm for total variation minimization and applications, Journal of Mathematical Imaging and Vision, Springer, 2004, 20, 89-97. From 75d706ca2558e5b19bc7ae08ead10a6bc466ca5a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Fri, 5 Oct 2012 23:09:34 +0200 Subject: [PATCH 62/81] Add get_pixel function for 3D arrays --- skimage/_shared/interpolation.pxd | 7 ++-- skimage/_shared/interpolation.pyx | 54 +++++++++++++++++++++++++------ 2 files changed, 49 insertions(+), 12 deletions(-) diff --git a/skimage/_shared/interpolation.pxd b/skimage/_shared/interpolation.pxd index f43ff25e..4e00dfb0 100644 --- a/skimage/_shared/interpolation.pxd +++ b/skimage/_shared/interpolation.pxd @@ -18,7 +18,10 @@ cdef double bicubic_interpolation(double* image, int rows, int cols, double r, double c, char mode, double cval) -cdef double get_pixel(double* image, int rows, int cols, int r, int c, - char mode, double cval) +cdef double get_pixel2d(double* image, int rows, int cols, int r, int c, + char mode, double cval) + +cdef double get_pixel3d(double* image, int rows, int cols, int dims, int r, + int c, int d, char mode, double cval) cdef int coord_map(int dim, int coord, char mode) diff --git a/skimage/_shared/interpolation.pyx b/skimage/_shared/interpolation.pyx index e0fd0067..b34ba507 100644 --- a/skimage/_shared/interpolation.pyx +++ b/skimage/_shared/interpolation.pyx @@ -35,8 +35,8 @@ cdef inline double nearest_neighbour_interpolation(double* image, int rows, """ - return get_pixel(image, rows, cols, round(r), round(c), - mode, cval) + return get_pixel2d(image, rows, cols, round(r), round(c), + mode, cval) cdef inline double bilinear_interpolation(double* image, int rows, int cols, @@ -72,10 +72,10 @@ cdef inline double bilinear_interpolation(double* image, int rows, int cols, maxc = ceil(c) dr = r - minr dc = c - minc - top = (1 - dc) * get_pixel(image, rows, cols, minr, minc, mode, cval) \ - + dc * get_pixel(image, rows, cols, minr, maxc, mode, cval) - bottom = (1 - dc) * get_pixel(image, rows, cols, maxr, minc, mode, cval) \ - + dc * get_pixel(image, rows, cols, maxr, maxc, mode, cval) + top = (1 - dc) * get_pixel2d(image, rows, cols, minr, minc, mode, cval) \ + + dc * get_pixel2d(image, rows, cols, minr, maxc, mode, cval) + bottom = (1 - dc) * get_pixel2d(image, rows, cols, maxr, minc, mode, cval) \ + + dc * get_pixel2d(image, rows, cols, maxr, maxc, mode, cval) return (1 - dr) * top + dr * bottom @@ -144,7 +144,7 @@ cdef inline double biquadratic_interpolation(double* image, int rows, int cols, # row-wise cubic interpolation for pr in range(r0, r0 + 3): for pc in range(c0, c0 + 3): - fc[pc - c0] = get_pixel(image, rows, cols, pr, pc, mode, cval) + fc[pc - c0] = get_pixel2d(image, rows, cols, pr, pc, mode, cval) fr[pr - r0] = quadratic_interpolation(xc, fc) # cubic interpolation for interpolated values of each row @@ -216,15 +216,15 @@ cdef inline double bicubic_interpolation(double* image, int rows, int cols, # row-wise cubic interpolation for pr in range(r0, r0 + 4): for pc in range(c0, c0 + 4): - fc[pc - c0] = get_pixel(image, rows, cols, pr, pc, mode, cval) + fc[pc - c0] = get_pixel2d(image, rows, cols, pr, pc, mode, cval) fr[pr - r0] = cubic_interpolation(xc, fc) # cubic interpolation for interpolated values of each row return cubic_interpolation(xr, fr) -cdef inline double get_pixel(double* image, int rows, int cols, int r, int c, - char mode, double cval): +cdef inline double get_pixel2d(double* image, int rows, int cols, int r, int c, + char mode, double cval): """Get a pixel from the image, taking wrapping mode into consideration. Parameters @@ -255,6 +255,40 @@ cdef inline double get_pixel(double* image, int rows, int cols, int r, int c, return image[coord_map(rows, r, mode) * cols + coord_map(cols, c, mode)] +cdef inline double get_pixel3d(double* image, int rows, int cols, int dims, int r, + int c, int d, char mode, double cval): + """Get a pixel from the image, taking wrapping mode into consideration. + + Parameters + ---------- + image : double array + Input image. + rows, cols, dims : int + Shape of image. + r, c, d : int + Position at which to get the pixel. + mode : {'C', 'W', 'R', 'N'} + Wrapping mode. Constant, Wrap, Reflect or Nearest. + cval : double + Constant value to use for constant mode. + + Returns + ------- + value : double + Pixel value at given position. + + """ + if mode == 'C': + if (r < 0) or (r > rows - 1) or (c < 0) or (c > cols - 1): + return cval + else: + return image[r * cols * dims + c * dims + d] + else: + return image[coord_map(rows, r, mode) * cols * dims + + coord_map(cols, c, mode) * dims + + d] + + cdef inline int coord_map(int dim, int coord, char mode): """ Wrap a coordinate, according to a given mode. From f9ecd140d8942f1db6226df4e7a15d56d79d922c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 00:34:05 +0200 Subject: [PATCH 63/81] Add bilateral denoising filter --- skimage/filter/__init__.py | 2 +- skimage/filter/_denoise.pyx | 160 ++++++++++++++++++++++++++++++++++++ skimage/filter/denoise.py | 57 +++++++++++++ skimage/filter/setup.py | 3 + 4 files changed, 221 insertions(+), 1 deletion(-) create mode 100644 skimage/filter/_denoise.pyx diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py index dc5f9896..eec88038 100644 --- a/skimage/filter/__init__.py +++ b/skimage/filter/__init__.py @@ -3,6 +3,6 @@ from .ctmf import median_filter from ._canny import canny from .edges import (sobel, hsobel, vsobel, scharr, hscharr, vscharr, prewitt, hprewitt, vprewitt) -from .denoise import tv_denoise +from .denoise import tv_denoise, denoise_bilateral from ._rank_order import rank_order from .thresholding import threshold_otsu, threshold_adaptive diff --git a/skimage/filter/_denoise.pyx b/skimage/filter/_denoise.pyx new file mode 100644 index 00000000..bf6c372a --- /dev/null +++ b/skimage/filter/_denoise.pyx @@ -0,0 +1,160 @@ +#cython: cdivision=True +#cython: boundscheck=False +#cython: nonecheck=False +#cython: wraparound=False + +cimport numpy as cnp +import numpy as np +from libc.math cimport exp, fabs, sqrt +from libc.stdlib cimport malloc, free +from skimage._shared.interpolation cimport get_pixel2d, get_pixel3d + + +cdef inline double _gaussian_weight(double sigma, double value): + return exp(- 0.5 * (value / sigma)**2) + + +cdef double* _compute_color_lut(int bins, double sigma, double max_value): + cdef double* color_lut = malloc(bins * sizeof(double)) + cdef Py_ssize_t b + for b in range(bins): + color_lut[b] = _gaussian_weight(sigma, b * max_value / bins) + return color_lut + + +cdef double* _compute_range_lut(int win_size, double sigma): + cdef double* range_lut = malloc(win_size**2 * sizeof(double)) + cdef Py_ssize_t kr, kc + cdef Py_ssize_t window_ext = (win_size - 1) / 2 + cdef double dist + for kr in range(win_size): + for kc in range(win_size): + dist = sqrt((kr - window_ext)**2 + (kc - window_ext)**2) + range_lut[kr * win_size + kc] = _gaussian_weight(sigma, dist) + return range_lut + + +def _denoise_bilateral2d(cnp.ndarray[dtype=cnp.double_t, ndim=2, mode='c'] image, + int win_size, double sigma_color, + double sigma_range, int bins, char mode, + double cval): + + cdef Py_ssize_t rows = image.shape[0] + cdef Py_ssize_t cols = image.shape[1] + cdef Py_ssize_t window_ext = (win_size - 1) / 2 + cdef double max_value = image.max() + + cdef cnp.ndarray[dtype=cnp.double_t, ndim=2, mode='c'] out = \ + np.zeros((rows, cols), dtype=np.double) + + cdef double* image_data = image.data + cdef double* out_data = out.data + + cdef double* color_lut = _compute_color_lut(bins, sigma_color, max_value) + cdef double* range_lut = _compute_range_lut(win_size, sigma_range) + + cdef Py_ssize_t r, c, wr, wc, kr, kc, rr, cc, pixel_addr + cdef double centre, value, weight, total_value, total_weight, \ + color_weight, range_weight, diff + cdef double dist_scale = bins / max_value + + for r in range(rows): + for c in range(cols): + pixel_addr = r * cols + c + total_value = 0 + total_weight = 0 + centre = image_data[pixel_addr] + for wr in range(- window_ext, window_ext + 1): + rr = wr + r + kr = wr + window_ext + for wc in range(- window_ext, window_ext + 1): + cc = wc + c + kc = wc + window_ext + + value = get_pixel2d(image_data, rows, cols, + rr, cc, mode, cval) + diff = fabs(centre - value) + + range_weight = range_lut[kr * win_size + kc] + color_weight = color_lut[(diff * dist_scale)] + + weight = range_weight * color_weight + total_value += value * weight + total_weight += weight + + out_data[pixel_addr] = total_value / total_weight + + free(color_lut) + free(range_lut) + + return out + + +def _denoise_bilateral3d(cnp.ndarray[dtype=cnp.double_t, ndim=3, mode='c'] image, + int win_size, double sigma_color, + double sigma_range, int bins, char mode, + double cval): + + cdef Py_ssize_t rows = image.shape[0] + cdef Py_ssize_t cols = image.shape[1] + cdef Py_ssize_t dims = image.shape[2] + cdef Py_ssize_t window_ext = (win_size - 1) / 2 + cdef double max_value = image.max() + + cdef cnp.ndarray[dtype=cnp.double_t, ndim=3, mode='c'] out = \ + np.zeros((rows, cols, dims), dtype=np.double) + + cdef double* image_data = image.data + cdef double* out_data = out.data + + cdef double* color_lut = _compute_color_lut(bins, sigma_color, max_value) + cdef double* range_lut = _compute_range_lut(win_size, sigma_range) + + cdef Py_ssize_t r, c, d, wr, wc, kr, kc, rr, cc, pixel_addr + cdef double value, weight, dist, total_weight, color_weight, range_weight + cdef double dist_scale = bins / dims / max_value + cdef double* values = malloc(dims * sizeof(double)) + cdef double* centres = malloc(dims * sizeof(double)) + cdef double* total_values = malloc(dims * sizeof(double)) + + for r in range(rows): + for c in range(cols): + pixel_addr = r * cols * dims + c * dims + total_weight = 0 + for d in range(dims): + total_values[d] = 0 + centres[d] = image_data[pixel_addr + d] + for wr in range(- window_ext, window_ext + 1): + rr = wr + r + kr = wr + window_ext + for wc in range(- window_ext, window_ext + 1): + cc = wc + c + kc = wc + window_ext + + # save pixel values for all dims and compute euclidian + # distance between centre stack and current position + dist = 0 + for d in range(dims): + value = get_pixel3d(image_data, rows, cols, dims, + rr, cc, d, mode, cval) + values[d] = value + dist += (centres[d] - value)**2 + dist = sqrt(dist) + + range_weight = range_lut[kr * win_size + kc] + color_weight = color_lut[(dist * dist_scale)] + + weight = range_weight * color_weight + for d in range(dims): + total_values[d] += values[d] * weight + total_weight += weight + for d in range(dims): + out_data[pixel_addr + d] = total_values[d] / total_weight + + free(color_lut) + free(range_lut) + free(values) + free(centres) + free(total_values) + + return out diff --git a/skimage/filter/denoise.py b/skimage/filter/denoise.py index ae4d2f82..f6b30f6f 100644 --- a/skimage/filter/denoise.py +++ b/skimage/filter/denoise.py @@ -1,5 +1,6 @@ import numpy as np from skimage import img_as_float +import _denoise def _tv_denoise_3d(im, weight=100, eps=2.e-4, n_iter_max=200): @@ -239,3 +240,59 @@ def tv_denoise(im, weight=50, eps=2.e-4, n_iter_max=200): raise ValueError('only 2-d and 3-d images may be denoised with this ' 'function') return out + + +def denoise_bilateral(image, win_size=5, sigma_color=1, sigma_range=1, bins=1e4, + mode='constant', cval=0): + """Denoise image using bilateral filter. + + Parameters + ---------- + image : ndarray + Input image. + win_size : int + Window size for filtering. + sigma_color : float + Standard deviation for color distance. A larger value results in + averaging of pixels with larger color differences. + sigma_range : float + Standard deviation for range distance. A larger value results in + averaging of pixels with larger spatial differences. + bins : int + Number of discrete values for gaussian weights of color filtering. + A larger value results in improved accuracy. + mode : string + How to handle values outside the image borders. See + `scipy.ndimage.map_coordinates` for detail. + cval : string + Used in conjunction with mode 'constant', the value outside + the image boundaries. + + Returns + ------- + denoised : ndarray + Denoised image. + + References + ---------- + .. [1] http://users.soe.ucsc.edu/~manduchi/Papers/ICCV98.pdf + + """ + + # not using img_as_float to preserve original range of values, which is + # necessary so sigma_color is applied as user desires + image = np.array(image, dtype=np.double) + + if mode not in ('constant', 'wrap', 'reflect', 'nearest'): + raise ValueError("Invalid mode specified. Please use " + "`constant`, `nearest`, `wrap` or `reflect`.") + mode = ord(mode[0].upper()) + + if image.ndim == 2 or (image.ndim == 3 and image.shape[2] == 1): + if image.ndim == 3 and image.shape[2] == 1: + image = np.squeeze(image) + func = _denoise._denoise_bilateral2d + else: + func = _denoise._denoise_bilateral3d + image = np.ascontiguousarray(image) + return func(image, win_size, sigma_color, sigma_range, bins, mode, cval) diff --git a/skimage/filter/setup.py b/skimage/filter/setup.py index 3e573aec..b996055b 100644 --- a/skimage/filter/setup.py +++ b/skimage/filter/setup.py @@ -13,9 +13,12 @@ def configuration(parent_package='', top_path=None): config.add_data_dir('tests') cython(['_ctmf.pyx'], working_path=base_path) + cython(['_denoise.pyx'], working_path=base_path) config.add_extension('_ctmf', sources=['_ctmf.c'], include_dirs=[get_numpy_include_dirs()]) + config.add_extension('_denoise', sources=['_denoise.c'], + include_dirs=[get_numpy_include_dirs(), '../_shared']) return config From cec7b6055d21ae0a9ac65b10d9fbc73feac70979 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 08:32:08 +0200 Subject: [PATCH 64/81] Restructure cdef declarations --- skimage/filter/_denoise.pyx | 85 +++++++++++++++++++++---------------- 1 file changed, 48 insertions(+), 37 deletions(-) diff --git a/skimage/filter/_denoise.pyx b/skimage/filter/_denoise.pyx index bf6c372a..b0da5ddb 100644 --- a/skimage/filter/_denoise.pyx +++ b/skimage/filter/_denoise.pyx @@ -15,22 +15,30 @@ cdef inline double _gaussian_weight(double sigma, double value): cdef double* _compute_color_lut(int bins, double sigma, double max_value): - cdef double* color_lut = malloc(bins * sizeof(double)) - cdef Py_ssize_t b + + cdef: + double* color_lut = malloc(bins * sizeof(double)) + Py_ssize_t b + for b in range(bins): color_lut[b] = _gaussian_weight(sigma, b * max_value / bins) + return color_lut cdef double* _compute_range_lut(int win_size, double sigma): - cdef double* range_lut = malloc(win_size**2 * sizeof(double)) - cdef Py_ssize_t kr, kc - cdef Py_ssize_t window_ext = (win_size - 1) / 2 - cdef double dist + + cdef: + double* range_lut = malloc(win_size**2 * sizeof(double)) + Py_ssize_t kr, kc + Py_ssize_t window_ext = (win_size - 1) / 2 + double dist + for kr in range(win_size): for kc in range(win_size): dist = sqrt((kr - window_ext)**2 + (kc - window_ext)**2) range_lut[kr * win_size + kc] = _gaussian_weight(sigma, dist) + return range_lut @@ -39,24 +47,25 @@ def _denoise_bilateral2d(cnp.ndarray[dtype=cnp.double_t, ndim=2, mode='c'] image double sigma_range, int bins, char mode, double cval): - cdef Py_ssize_t rows = image.shape[0] - cdef Py_ssize_t cols = image.shape[1] - cdef Py_ssize_t window_ext = (win_size - 1) / 2 - cdef double max_value = image.max() + cdef: + Py_ssize_t rows = image.shape[0] + Py_ssize_t cols = image.shape[1] + Py_ssize_t window_ext = (win_size - 1) / 2 + double max_value = image.max() - cdef cnp.ndarray[dtype=cnp.double_t, ndim=2, mode='c'] out = \ - np.zeros((rows, cols), dtype=np.double) + cnp.ndarray[dtype=cnp.double_t, ndim=2, mode='c'] out = \ + np.zeros((rows, cols), dtype=np.double) - cdef double* image_data = image.data - cdef double* out_data = out.data + double* image_data = image.data + double* out_data = out.data - cdef double* color_lut = _compute_color_lut(bins, sigma_color, max_value) - cdef double* range_lut = _compute_range_lut(win_size, sigma_range) + double* color_lut = _compute_color_lut(bins, sigma_color, max_value) + double* range_lut = _compute_range_lut(win_size, sigma_range) - cdef Py_ssize_t r, c, wr, wc, kr, kc, rr, cc, pixel_addr - cdef double centre, value, weight, total_value, total_weight, \ - color_weight, range_weight, diff - cdef double dist_scale = bins / max_value + Py_ssize_t r, c, wr, wc, kr, kc, rr, cc, pixel_addr + double centre, value, weight, total_value, total_weight, \ + color_weight, range_weight, diff + double dist_scale = bins / max_value for r in range(rows): for c in range(cols): @@ -95,27 +104,29 @@ def _denoise_bilateral3d(cnp.ndarray[dtype=cnp.double_t, ndim=3, mode='c'] image double sigma_range, int bins, char mode, double cval): - cdef Py_ssize_t rows = image.shape[0] - cdef Py_ssize_t cols = image.shape[1] - cdef Py_ssize_t dims = image.shape[2] - cdef Py_ssize_t window_ext = (win_size - 1) / 2 - cdef double max_value = image.max() + cdef: + Py_ssize_t rows = image.shape[0] + Py_ssize_t cols = image.shape[1] + Py_ssize_t dims = image.shape[2] + Py_ssize_t window_ext = (win_size - 1) / 2 - cdef cnp.ndarray[dtype=cnp.double_t, ndim=3, mode='c'] out = \ - np.zeros((rows, cols, dims), dtype=np.double) + double max_value = image.max() - cdef double* image_data = image.data - cdef double* out_data = out.data + cnp.ndarray[dtype=cnp.double_t, ndim=3, mode='c'] out = \ + np.zeros((rows, cols, dims), dtype=np.double) - cdef double* color_lut = _compute_color_lut(bins, sigma_color, max_value) - cdef double* range_lut = _compute_range_lut(win_size, sigma_range) + double* image_data = image.data + double* out_data = out.data - cdef Py_ssize_t r, c, d, wr, wc, kr, kc, rr, cc, pixel_addr - cdef double value, weight, dist, total_weight, color_weight, range_weight - cdef double dist_scale = bins / dims / max_value - cdef double* values = malloc(dims * sizeof(double)) - cdef double* centres = malloc(dims * sizeof(double)) - cdef double* total_values = malloc(dims * sizeof(double)) + double* color_lut = _compute_color_lut(bins, sigma_color, max_value) + double* range_lut = _compute_range_lut(win_size, sigma_range) + + Py_ssize_t r, c, d, wr, wc, kr, kc, rr, cc, pixel_addr + double value, weight, dist, total_weight, color_weight, range_weight + double dist_scale = bins / dims / max_value + double* values = malloc(dims * sizeof(double)) + double* centres = malloc(dims * sizeof(double)) + double* total_values = malloc(dims * sizeof(double)) for r in range(rows): for c in range(cols): From 3757e5c5eb0f142d6f23dcab3cfae98811c014f5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 22:03:04 +0200 Subject: [PATCH 65/81] Use common file for denoising filters --- skimage/filter/tests/{test_tv_denoise.py => test_denoise.py} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename skimage/filter/tests/{test_tv_denoise.py => test_denoise.py} (100%) diff --git a/skimage/filter/tests/test_tv_denoise.py b/skimage/filter/tests/test_denoise.py similarity index 100% rename from skimage/filter/tests/test_tv_denoise.py rename to skimage/filter/tests/test_denoise.py From 7967d5fb49cd1bb0b1ed8d2417c3ace36f47600d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 22:18:41 +0200 Subject: [PATCH 66/81] Refactor denoise tests and add tests for bilateral filter --- skimage/filter/tests/test_denoise.py | 135 ++++++++++++++++----------- 1 file changed, 78 insertions(+), 57 deletions(-) diff --git a/skimage/filter/tests/test_denoise.py b/skimage/filter/tests/test_denoise.py index cc4fae7e..2efbba84 100644 --- a/skimage/filter/tests/test_denoise.py +++ b/skimage/filter/tests/test_denoise.py @@ -1,68 +1,89 @@ import numpy as np -from numpy.testing import run_module_suite +from numpy.testing import run_module_suite, assert_raises -from skimage import filter, data, color +from skimage import filter, data, color, img_as_float -class TestTvDenoise(): +lena = img_as_float(data.lena()[:256, :256]) +lena_gray = color.rgb2gray(lena) - def test_tv_denoise_2d(self): - """ - Apply the TV denoising algorithm on the lena image provided - by scipy - """ - # lena image - lena = color.rgb2gray(data.lena())[:256, :256] - # add noise to lena - lena += 0.5 * lena.std() * np.random.randn(*lena.shape) - # clip noise so that it does not exceed allowed range for float images. - lena = np.clip(lena, 0, 1) - # denoise - denoised_lena = filter.tv_denoise(lena, weight=60.0) - # which dtype? - assert denoised_lena.dtype in [np.float, np.float32, np.float64] - from scipy import ndimage - grad = ndimage.morphological_gradient(lena, size=((3, 3))) - grad_denoised = ndimage.morphological_gradient( - denoised_lena, size=((3, 3))) - # test if the total variation has decreased - assert grad_denoised.dtype == np.float - assert (np.sqrt((grad_denoised**2).sum()) - < np.sqrt((grad**2).sum()) / 2) - def test_tv_denoise_float_result_range(self): - # lena image - lena = color.rgb2gray(data.lena())[:256, :256] - int_lena = np.multiply(lena, 255).astype(np.uint8) - assert np.max(int_lena) > 1 - denoised_int_lena = filter.tv_denoise(int_lena, weight=60.0) - # test if the value range of output float data is within [0.0:1.0] - assert denoised_int_lena.dtype == np.float - assert np.max(denoised_int_lena) <= 1.0 - assert np.min(denoised_int_lena) >= 0.0 +def test_tv_denoise_2d(): + # lena image + img = lena_gray + # add noise to lena + img += 0.5 * img.std() * np.random.random(img.shape) + # clip noise so that it does not exceed allowed range for float images. + img = np.clip(img, 0, 1) + # denoise + denoised_lena = filter.tv_denoise(img, weight=60.0) + # which dtype? + assert denoised_lena.dtype in [np.float, np.float32, np.float64] + from scipy import ndimage + grad = ndimage.morphological_gradient(img, size=((3, 3))) + grad_denoised = ndimage.morphological_gradient( + denoised_lena, size=((3, 3))) + # test if the total variation has decreased + assert grad_denoised.dtype == np.float + assert (np.sqrt((grad_denoised**2).sum()) + < np.sqrt((grad**2).sum()) / 2) - def test_tv_denoise_3d(self): - """ - Apply the TV denoising algorithm on a 3D image representing - a sphere. - """ - x, y, z = np.ogrid[0:40, 0:40, 0:40] - mask = (x - 22)**2 + (y - 20)**2 + (z - 17)**2 < 8**2 - mask = 100 * mask.astype(np.float) - mask += 60 - mask += 20 * np.random.randn(*mask.shape) - mask[mask < 0] = 0 - mask[mask > 255] = 255 - res = filter.tv_denoise(mask.astype(np.uint8), weight=100) - assert res.dtype == np.float - assert res.std() * 255 < mask.std() - # test wrong number of dimensions - a = np.random.random((8, 8, 8, 8)) - try: - res = filter.tv_denoise(a) - except ValueError: - pass +def test_tv_denoise_float_result_range(): + # lena image + img = lena_gray + int_lena = np.multiply(img, 255).astype(np.uint8) + assert np.max(int_lena) > 1 + denoised_int_lena = filter.tv_denoise(int_lena, weight=60.0) + # test if the value range of output float data is within [0.0:1.0] + assert denoised_int_lena.dtype == np.float + assert np.max(denoised_int_lena) <= 1.0 + assert np.min(denoised_int_lena) >= 0.0 + + +def test_tv_denoise_3d(): + """Apply the TV denoising algorithm on a 3D image representing a sphere.""" + x, y, z = np.ogrid[0:40, 0:40, 0:40] + mask = (x - 22)**2 + (y - 20)**2 + (z - 17)**2 < 8**2 + mask = 100 * mask.astype(np.float) + mask += 60 + mask += 20 * np.random.random(mask.shape) + mask[mask < 0] = 0 + mask[mask > 255] = 255 + res = filter.tv_denoise(mask.astype(np.uint8), weight=100) + assert res.dtype == np.float + assert res.std() * 255 < mask.std() + + # test wrong number of dimensions + assert_raises(ValueError, filter.tv_denoise, np.random.random((8, 8, 8, 8))) + + +def test_denoise_bilateral_2d(): + img = lena_gray + # add some random noise + img += 0.5 * img.std() * np.random.random(img.shape) + img = np.clip(img, 0, 1) + + out1 = filter.denoise_bilateral(img, sigma_color=0.1, sigma_range=20) + out2 = filter.denoise_bilateral(img, sigma_color=0.2, sigma_range=30) + + # make sure noise is reduced + assert img.std() > out1.std() + assert out1.std() > out2.std() + + +def test_denoise_bilateral_3d(): + img = lena + # add some random noise + img += 0.5 * img.std() * np.random.random(img.shape) + img = np.clip(img, 0, 1) + + out1 = filter.denoise_bilateral(img, sigma_color=0.1, sigma_range=20) + out2 = filter.denoise_bilateral(img, sigma_color=0.2, sigma_range=30) + + # make sure noise is reduced + assert img.std() > out1.std() + assert out1.std() > out2.std() if __name__ == "__main__": From e39012aa240736fcc570416f2e0ece8f15c9744a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 22:31:34 +0200 Subject: [PATCH 67/81] Add more detailed description of bilateral filter --- skimage/filter/denoise.py | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/skimage/filter/denoise.py b/skimage/filter/denoise.py index f6b30f6f..50ca0247 100644 --- a/skimage/filter/denoise.py +++ b/skimage/filter/denoise.py @@ -246,6 +246,17 @@ def denoise_bilateral(image, win_size=5, sigma_color=1, sigma_range=1, bins=1e4, mode='constant', cval=0): """Denoise image using bilateral filter. + This is an edge-preserving and noise reducing denoising filter. It averages + pixel based on their spatial closeness and radiometric similarity. + + Spatial closeness is measured by the gaussian function of the euclidian + distance between two pixels and a certain standard deviation + (`sigma_range`). + + Radiometric similarity is measured by the gaussian function of the euclidian + distance between two color values and a certain standard deviation + (`sigma_color`). + Parameters ---------- image : ndarray From 8de3ec988de42d9ceb92e6d436f7d332eb5d337f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 22:51:16 +0200 Subject: [PATCH 68/81] Add example script for bilateral denoising --- doc/examples/plot_denoise.py | 64 ++++++++++++++++++++++++++++ doc/examples/plot_lena_tv_denoise.py | 51 ---------------------- 2 files changed, 64 insertions(+), 51 deletions(-) create mode 100644 doc/examples/plot_denoise.py delete mode 100644 doc/examples/plot_lena_tv_denoise.py diff --git a/doc/examples/plot_denoise.py b/doc/examples/plot_denoise.py new file mode 100644 index 00000000..30dfc10c --- /dev/null +++ b/doc/examples/plot_denoise.py @@ -0,0 +1,64 @@ +""" +============================= +Denoising the picture of Lena +============================= + +In this example, we denoise a noisy version of the picture of Lena using the +total variation and bilateral denoising filter. + +These algorithms typically produce "posterized" images with flat domains +separated by sharp edges. It is possible to change the degree of posterization +by controlling the tradeoff between denoising and faithfulness to the original +image. + +Total variation filter +---------------------- + +The result of this filter is an image that has a minimal total variation norm, +while being as close to the initial image as possible. The total variation is +the L1 norm of the gradient of the image, and minimizing the total variation. + +Bilateral filter +---------------- +A bilateral filter is an edge-preserving and noise reducing denoising filter. +It averages pixel based on their spatial closeness and radiometric similarity. + +""" + +import numpy as np +import matplotlib.pyplot as plt + +from skimage import data, color, img_as_float +from skimage.filter import tv_denoise, denoise_bilateral + +lena = img_as_float(data.lena()) +lena = lena[220:300, 220:320] + +noisy = lena + 0.5 * lena.std() * np.random.random(lena.shape) +noisy = np.clip(noisy, 0, 1) + +fig, ax = plt.subplots(nrows=2, ncols=3, figsize=(8, 5)) + +ax[0, 0].imshow(lena) +ax[0, 0].axis('off') +ax[0, 0].set_title('original') +ax[0, 1].imshow(tv_denoise(noisy, weight=0.02)) +ax[0, 1].axis('off') +ax[0, 1].set_title('TV') +ax[0, 2].imshow(tv_denoise(noisy, weight=0.05)) +ax[0, 2].axis('off') +ax[0, 2].set_title('(more) TV') + +ax[1, 0].imshow(noisy) +ax[1, 0].axis('off') +ax[1, 0].set_title('original') +ax[1, 1].imshow(denoise_bilateral(noisy, sigma_color=0.02, sigma_range=15)) +ax[1, 1].axis('off') +ax[1, 1].set_title('Bilateral') +ax[1, 2].imshow(denoise_bilateral(noisy, sigma_color=0.05, sigma_range=15)) +ax[1, 2].axis('off') +ax[1, 2].set_title('(more) Bilateral') + +fig.subplots_adjust(wspace=0.02, hspace=0.2, top=0.9, bottom=0.05, left=0, right=1) + +plt.show() diff --git a/doc/examples/plot_lena_tv_denoise.py b/doc/examples/plot_lena_tv_denoise.py deleted file mode 100644 index bce07845..00000000 --- a/doc/examples/plot_lena_tv_denoise.py +++ /dev/null @@ -1,51 +0,0 @@ -""" -==================================================== -Denoising the picture of Lena using total variation -==================================================== - -In this example, we denoise a noisy version of the picture of Lena -using the total variation denoising filter. The result of this filter -is an image that has a minimal total variation norm, while being as -close to the initial image as possible. The total variation is the L1 -norm of the gradient of the image, and minimizing the total variation -typically produces "posterized" images with flat domains separated by -sharp edges. - -It is possible to change the degree of posterization by controlling -the tradeoff between denoising and faithfulness to the original image. - -""" - -import numpy as np -import matplotlib.pyplot as plt - -from skimage import data, color, img_as_ubyte -from skimage.filter import tv_denoise - -l = img_as_ubyte(color.rgb2gray(data.lena())) -l = l[230:290, 220:320] - -noisy = l + 0.4 * l.std() * np.random.random(l.shape) - -tv_denoised = tv_denoise(noisy, weight=10) - -plt.figure(figsize=(8, 2)) - -plt.subplot(131) -plt.imshow(noisy, cmap=plt.cm.gray, vmin=40, vmax=220) -plt.axis('off') -plt.title('noisy', fontsize=20) -plt.subplot(132) -plt.imshow(tv_denoised, cmap=plt.cm.gray, vmin=40, vmax=220) -plt.axis('off') -plt.title('TV denoising', fontsize=20) - -tv_denoised = tv_denoise(noisy, weight=50) -plt.subplot(133) -plt.imshow(tv_denoised, cmap=plt.cm.gray, vmin=40, vmax=220) -plt.axis('off') -plt.title('(more) TV denoising', fontsize=20) - -plt.subplots_adjust(wspace=0.02, hspace=0.02, top=0.9, bottom=0, left=0, - right=1) -plt.show() From 415a3c69b368e587aac158ea852785dba472f88b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Sat, 6 Oct 2012 22:52:05 +0200 Subject: [PATCH 69/81] Wrap column --- doc/examples/plot_denoise.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/doc/examples/plot_denoise.py b/doc/examples/plot_denoise.py index 30dfc10c..4a05e339 100644 --- a/doc/examples/plot_denoise.py +++ b/doc/examples/plot_denoise.py @@ -59,6 +59,7 @@ ax[1, 2].imshow(denoise_bilateral(noisy, sigma_color=0.05, sigma_range=15)) ax[1, 2].axis('off') ax[1, 2].set_title('(more) Bilateral') -fig.subplots_adjust(wspace=0.02, hspace=0.2, top=0.9, bottom=0.05, left=0, right=1) +fig.subplots_adjust(wspace=0.02, hspace=0.2, + top=0.9, bottom=0.05, left=0, right=1) plt.show() From 52962f30f1215b705bee0beb70b40819ddf0164e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 16 Oct 2012 16:50:54 +0200 Subject: [PATCH 70/81] Reorder subplots --- doc/examples/plot_denoise.py | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/doc/examples/plot_denoise.py b/doc/examples/plot_denoise.py index 4a05e339..45e5e4b5 100644 --- a/doc/examples/plot_denoise.py +++ b/doc/examples/plot_denoise.py @@ -39,25 +39,25 @@ noisy = np.clip(noisy, 0, 1) fig, ax = plt.subplots(nrows=2, ncols=3, figsize=(8, 5)) -ax[0, 0].imshow(lena) +ax[0, 0].imshow(noisy) ax[0, 0].axis('off') -ax[0, 0].set_title('original') -ax[0, 1].imshow(tv_denoise(noisy, weight=0.02)) +ax[0, 0].set_title('noisy') +ax[0, 1].imshow(tv_denoise(noisy, weight=0.1)) ax[0, 1].axis('off') ax[0, 1].set_title('TV') -ax[0, 2].imshow(tv_denoise(noisy, weight=0.05)) +ax[0, 2].imshow(denoise_bilateral(noisy, sigma_color=0.03, sigma_range=15)) ax[0, 2].axis('off') -ax[0, 2].set_title('(more) TV') +ax[0, 2].set_title('Bilateral') -ax[1, 0].imshow(noisy) +ax[1, 0].imshow(tv_denoise(noisy, weight=0.2)) ax[1, 0].axis('off') -ax[1, 0].set_title('original') -ax[1, 1].imshow(denoise_bilateral(noisy, sigma_color=0.02, sigma_range=15)) +ax[1, 0].set_title('(more) TV') +ax[1, 1].imshow(denoise_bilateral(noisy, sigma_color=0.06, sigma_range=15)) ax[1, 1].axis('off') -ax[1, 1].set_title('Bilateral') -ax[1, 2].imshow(denoise_bilateral(noisy, sigma_color=0.05, sigma_range=15)) +ax[1, 1].set_title('(more) Bilateral') +ax[1, 2].imshow(lena) ax[1, 2].axis('off') -ax[1, 2].set_title('(more) Bilateral') +ax[1, 2].set_title('original') fig.subplots_adjust(wspace=0.02, hspace=0.2, top=0.9, bottom=0.05, left=0, right=1) From 62c1beccb59d714b96e9597fbbadd0bddab55972 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 16 Oct 2012 17:28:42 +0200 Subject: [PATCH 71/81] Fix description of denoising filters --- doc/examples/plot_denoise.py | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/doc/examples/plot_denoise.py b/doc/examples/plot_denoise.py index 45e5e4b5..12e8b9b6 100644 --- a/doc/examples/plot_denoise.py +++ b/doc/examples/plot_denoise.py @@ -16,12 +16,13 @@ Total variation filter The result of this filter is an image that has a minimal total variation norm, while being as close to the initial image as possible. The total variation is -the L1 norm of the gradient of the image, and minimizing the total variation. +the L1 norm of the gradient of the image. Bilateral filter ---------------- -A bilateral filter is an edge-preserving and noise reducing denoising filter. -It averages pixel based on their spatial closeness and radiometric similarity. + +A bilateral filter is an edge-preserving and noise reducing filter. It averages +pixels based on their spatial closeness and radiometric similarity. """ From 1a1560f69679240507668878a1c69e794554f42a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 16 Oct 2012 17:29:39 +0200 Subject: [PATCH 72/81] Fix PEP8 issues --- skimage/filter/_denoise.pyx | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) diff --git a/skimage/filter/_denoise.pyx b/skimage/filter/_denoise.pyx index b0da5ddb..ad25d9d0 100644 --- a/skimage/filter/_denoise.pyx +++ b/skimage/filter/_denoise.pyx @@ -11,7 +11,7 @@ from skimage._shared.interpolation cimport get_pixel2d, get_pixel3d cdef inline double _gaussian_weight(double sigma, double value): - return exp(- 0.5 * (value / sigma)**2) + return exp(-0.5 * (value / sigma)**2) cdef double* _compute_color_lut(int bins, double sigma, double max_value): @@ -73,10 +73,10 @@ def _denoise_bilateral2d(cnp.ndarray[dtype=cnp.double_t, ndim=2, mode='c'] image total_value = 0 total_weight = 0 centre = image_data[pixel_addr] - for wr in range(- window_ext, window_ext + 1): + for wr in range(-window_ext, window_ext + 1): rr = wr + r kr = wr + window_ext - for wc in range(- window_ext, window_ext + 1): + for wc in range(-window_ext, window_ext + 1): cc = wc + c kc = wc + window_ext @@ -135,10 +135,10 @@ def _denoise_bilateral3d(cnp.ndarray[dtype=cnp.double_t, ndim=3, mode='c'] image for d in range(dims): total_values[d] = 0 centres[d] = image_data[pixel_addr + d] - for wr in range(- window_ext, window_ext + 1): + for wr in range(-window_ext, window_ext + 1): rr = wr + r kr = wr + window_ext - for wc in range(- window_ext, window_ext + 1): + for wc in range(-window_ext, window_ext + 1): cc = wc + c kc = wc + window_ext From 108cbf90f8cbc48d5dc98e2c8d2be88f02c89735 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Tue, 16 Oct 2012 17:34:49 +0200 Subject: [PATCH 73/81] Fix typo in doc string of biliteral filter --- skimage/filter/denoise.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/skimage/filter/denoise.py b/skimage/filter/denoise.py index 50ca0247..f5c9e0ee 100644 --- a/skimage/filter/denoise.py +++ b/skimage/filter/denoise.py @@ -247,7 +247,7 @@ def denoise_bilateral(image, win_size=5, sigma_color=1, sigma_range=1, bins=1e4, """Denoise image using bilateral filter. This is an edge-preserving and noise reducing denoising filter. It averages - pixel based on their spatial closeness and radiometric similarity. + pixels based on their spatial closeness and radiometric similarity. Spatial closeness is measured by the gaussian function of the euclidian distance between two pixels and a certain standard deviation From 5b8f554a2e86f0450301844e9ee93a26ab00ee3b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 17 Oct 2012 12:09:09 +0200 Subject: [PATCH 74/81] Rename tv_denoise to denoise_tv and deprecate --- skimage/filter/__init__.py | 2 +- skimage/filter/denoise.py | 22 +++++++++++++--------- skimage/filter/tests/test_denoise.py | 14 +++++++------- 3 files changed, 21 insertions(+), 17 deletions(-) diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py index eec88038..02fddf23 100644 --- a/skimage/filter/__init__.py +++ b/skimage/filter/__init__.py @@ -3,6 +3,6 @@ from .ctmf import median_filter from ._canny import canny from .edges import (sobel, hsobel, vsobel, scharr, hscharr, vscharr, prewitt, hprewitt, vprewitt) -from .denoise import tv_denoise, denoise_bilateral +from .denoise import tv_denoise, denoise_tv, denoise_bilateral from ._rank_order import rank_order from .thresholding import threshold_otsu, threshold_adaptive diff --git a/skimage/filter/denoise.py b/skimage/filter/denoise.py index f5c9e0ee..d7c96f90 100644 --- a/skimage/filter/denoise.py +++ b/skimage/filter/denoise.py @@ -1,9 +1,10 @@ import numpy as np from skimage import img_as_float +from skimage._shared.utils import deprecated import _denoise -def _tv_denoise_3d(im, weight=100, eps=2.e-4, n_iter_max=200): +def _denoise_tv_3d(im, weight=100, eps=2.e-4, n_iter_max=200): """Perform total-variation denoising on 3-D arrays. Parameters @@ -38,7 +39,7 @@ def _tv_denoise_3d(im, weight=100, eps=2.e-4, n_iter_max=200): >>> mask = (x -22)**2 + (y - 20)**2 + (z - 17)**2 < 8**2 >>> mask = mask.astype(np.float) >>> mask += 0.2*np.random.randn(*mask.shape) - >>> res = tv_denoise_3d(mask, weight=100) + >>> res = denoise_tv_3d(mask, weight=100) """ px = np.zeros_like(im) py = np.zeros_like(im) @@ -83,7 +84,7 @@ def _tv_denoise_3d(im, weight=100, eps=2.e-4, n_iter_max=200): return out -def _tv_denoise_2d(im, weight=50, eps=2.e-4, n_iter_max=200): +def _denoise_tv_2d(im, weight=50, eps=2.e-4, n_iter_max=200): """Perform total-variation denoising. Parameters @@ -128,7 +129,7 @@ def _tv_denoise_2d(im, weight=50, eps=2.e-4, n_iter_max=200): >>> import scipy >>> lena = scipy.lena().astype(np.float) >>> lena += 0.5 * lena.std()*np.random.randn(*lena.shape) - >>> denoised_lena = tv_denoise(lena, weight=60.0) + >>> denoised_lena = denoise_tv(lena, weight=60.0) """ px = np.zeros_like(im) py = np.zeros_like(im) @@ -166,7 +167,7 @@ def _tv_denoise_2d(im, weight=50, eps=2.e-4, n_iter_max=200): return out -def tv_denoise(im, weight=50, eps=2.e-4, n_iter_max=200): +def denoise_tv(im, weight=50, eps=2.e-4, n_iter_max=200): """Perform total-variation denoising on 2-d and 3-d images. Parameters @@ -220,28 +221,31 @@ def tv_denoise(im, weight=50, eps=2.e-4, n_iter_max=200): >>> import scipy >>> lena = scipy.lena().astype(np.float) >>> lena += 0.5 * lena.std()*np.random.randn(*lena.shape) - >>> denoised_lena = tv_denoise(lena, weight=60) + >>> denoised_lena = denoise_tv(lena, weight=60) >>> # 3D example on synthetic data >>> x, y, z = np.ogrid[0:40, 0:40, 0:40] >>> mask = (x -22)**2 + (y - 20)**2 + (z - 17)**2 < 8**2 >>> mask = mask.astype(np.float) >>> mask += 0.2*np.random.randn(*mask.shape) - >>> res = tv_denoise_3d(mask, weight=100) + >>> res = denoise_tv_3d(mask, weight=100) """ im_type = im.dtype if not im_type.kind == 'f': im = img_as_float(im) if im.ndim == 2: - out = _tv_denoise_2d(im, weight, eps, n_iter_max) + out = _denoise_tv_2d(im, weight, eps, n_iter_max) elif im.ndim == 3: - out = _tv_denoise_3d(im, weight, eps, n_iter_max) + out = _denoise_tv_3d(im, weight, eps, n_iter_max) else: raise ValueError('only 2-d and 3-d images may be denoised with this ' 'function') return out +tv_denoise = deprecated('skimage.filter.denoise_tv')(denoise_tv) + + def denoise_bilateral(image, win_size=5, sigma_color=1, sigma_range=1, bins=1e4, mode='constant', cval=0): """Denoise image using bilateral filter. diff --git a/skimage/filter/tests/test_denoise.py b/skimage/filter/tests/test_denoise.py index 2efbba84..b8e6c9ef 100644 --- a/skimage/filter/tests/test_denoise.py +++ b/skimage/filter/tests/test_denoise.py @@ -8,7 +8,7 @@ lena = img_as_float(data.lena()[:256, :256]) lena_gray = color.rgb2gray(lena) -def test_tv_denoise_2d(): +def test_denoise_tv_2d(): # lena image img = lena_gray # add noise to lena @@ -16,7 +16,7 @@ def test_tv_denoise_2d(): # clip noise so that it does not exceed allowed range for float images. img = np.clip(img, 0, 1) # denoise - denoised_lena = filter.tv_denoise(img, weight=60.0) + denoised_lena = filter.denoise_tv(img, weight=60.0) # which dtype? assert denoised_lena.dtype in [np.float, np.float32, np.float64] from scipy import ndimage @@ -29,19 +29,19 @@ def test_tv_denoise_2d(): < np.sqrt((grad**2).sum()) / 2) -def test_tv_denoise_float_result_range(): +def test_denoise_tv_float_result_range(): # lena image img = lena_gray int_lena = np.multiply(img, 255).astype(np.uint8) assert np.max(int_lena) > 1 - denoised_int_lena = filter.tv_denoise(int_lena, weight=60.0) + denoised_int_lena = filter.denoise_tv(int_lena, weight=60.0) # test if the value range of output float data is within [0.0:1.0] assert denoised_int_lena.dtype == np.float assert np.max(denoised_int_lena) <= 1.0 assert np.min(denoised_int_lena) >= 0.0 -def test_tv_denoise_3d(): +def test_denoise_tv_3d(): """Apply the TV denoising algorithm on a 3D image representing a sphere.""" x, y, z = np.ogrid[0:40, 0:40, 0:40] mask = (x - 22)**2 + (y - 20)**2 + (z - 17)**2 < 8**2 @@ -50,12 +50,12 @@ def test_tv_denoise_3d(): mask += 20 * np.random.random(mask.shape) mask[mask < 0] = 0 mask[mask > 255] = 255 - res = filter.tv_denoise(mask.astype(np.uint8), weight=100) + res = filter.denoise_tv(mask.astype(np.uint8), weight=100) assert res.dtype == np.float assert res.std() * 255 < mask.std() # test wrong number of dimensions - assert_raises(ValueError, filter.tv_denoise, np.random.random((8, 8, 8, 8))) + assert_raises(ValueError, filter.denoise_tv, np.random.random((8, 8, 8, 8))) def test_denoise_bilateral_2d(): From c04f14c12941572c61b3046a8e058dbd9cc16c8f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 17 Oct 2012 16:28:44 +0200 Subject: [PATCH 75/81] Combine 2D and 3D bilateral filter in one function and rename sigma parameters --- doc/examples/plot_denoise.py | 4 +- skimage/filter/__init__.py | 3 +- skimage/filter/_denoise.pyx | 122 ++++++++++++++------------- skimage/filter/denoise.py | 67 --------------- skimage/filter/tests/test_denoise.py | 8 +- 5 files changed, 71 insertions(+), 133 deletions(-) diff --git a/doc/examples/plot_denoise.py b/doc/examples/plot_denoise.py index 12e8b9b6..a3e83a65 100644 --- a/doc/examples/plot_denoise.py +++ b/doc/examples/plot_denoise.py @@ -46,14 +46,14 @@ ax[0, 0].set_title('noisy') ax[0, 1].imshow(tv_denoise(noisy, weight=0.1)) ax[0, 1].axis('off') ax[0, 1].set_title('TV') -ax[0, 2].imshow(denoise_bilateral(noisy, sigma_color=0.03, sigma_range=15)) +ax[0, 2].imshow(denoise_bilateral(noisy, sigma_range=0.03, sigma_spatial=15)) ax[0, 2].axis('off') ax[0, 2].set_title('Bilateral') ax[1, 0].imshow(tv_denoise(noisy, weight=0.2)) ax[1, 0].axis('off') ax[1, 0].set_title('(more) TV') -ax[1, 1].imshow(denoise_bilateral(noisy, sigma_color=0.06, sigma_range=15)) +ax[1, 1].imshow(denoise_bilateral(noisy, sigma_range=0.06, sigma_spatial=15)) ax[1, 1].axis('off') ax[1, 1].set_title('(more) Bilateral') ax[1, 2].imshow(lena) diff --git a/skimage/filter/__init__.py b/skimage/filter/__init__.py index 02fddf23..f1c1fd49 100644 --- a/skimage/filter/__init__.py +++ b/skimage/filter/__init__.py @@ -3,6 +3,7 @@ from .ctmf import median_filter from ._canny import canny from .edges import (sobel, hsobel, vsobel, scharr, hscharr, vscharr, prewitt, hprewitt, vprewitt) -from .denoise import tv_denoise, denoise_tv, denoise_bilateral +from .denoise import tv_denoise, denoise_tv +from ._denoise import denoise_bilateral from ._rank_order import rank_order from .thresholding import threshold_otsu, threshold_adaptive diff --git a/skimage/filter/_denoise.pyx b/skimage/filter/_denoise.pyx index ad25d9d0..bda46b0d 100644 --- a/skimage/filter/_denoise.pyx +++ b/skimage/filter/_denoise.pyx @@ -7,7 +7,8 @@ cimport numpy as cnp import numpy as np from libc.math cimport exp, fabs, sqrt from libc.stdlib cimport malloc, free -from skimage._shared.interpolation cimport get_pixel2d, get_pixel3d +from skimage._shared.interpolation cimport get_pixel3d +from skimage.util import img_as_float cdef inline double _gaussian_weight(double sigma, double value): @@ -42,67 +43,57 @@ cdef double* _compute_range_lut(int win_size, double sigma): return range_lut -def _denoise_bilateral2d(cnp.ndarray[dtype=cnp.double_t, ndim=2, mode='c'] image, - int win_size, double sigma_color, - double sigma_range, int bins, char mode, - double cval): +def denoise_bilateral(image, int win_size=5, sigma_range=None, + double sigma_spatial=1, int bins=10000, mode='constant', + double cval=0): + """Denoise image using bilateral filter. - cdef: - Py_ssize_t rows = image.shape[0] - Py_ssize_t cols = image.shape[1] - Py_ssize_t window_ext = (win_size - 1) / 2 - double max_value = image.max() + This is an edge-preserving and noise reducing denoising filter. It averages + pixels based on their spatial closeness and radiometric similarity. - cnp.ndarray[dtype=cnp.double_t, ndim=2, mode='c'] out = \ - np.zeros((rows, cols), dtype=np.double) + Spatial closeness is measured by the gaussian function of the euclidian + distance between two pixels and a certain standard deviation + (`sigma_spatial`). - double* image_data = image.data - double* out_data = out.data + Radiometric similarity is measured by the gaussian function of the euclidian + distance between two color values and a certain standard deviation + (`sigma_range`). - double* color_lut = _compute_color_lut(bins, sigma_color, max_value) - double* range_lut = _compute_range_lut(win_size, sigma_range) + Parameters + ---------- + image : ndarray + Input image. + win_size : int + Window size for filtering. + sigma_range : float + Standard deviation for grayvalue/color distance (radiometric + similarity). A larger value results in averaging of pixels with larger + radiometric differences. + sigma_spatial : float + Standard deviation for range distance. A larger value results in + averaging of pixels with larger spatial differences. + bins : int + Number of discrete values for gaussian weights of color filtering. + A larger value results in improved accuracy. + mode : string + How to handle values outside the image borders. See + `scipy.ndimage.map_coordinates` for detail. + cval : string + Used in conjunction with mode 'constant', the value outside + the image boundaries. - Py_ssize_t r, c, wr, wc, kr, kc, rr, cc, pixel_addr - double centre, value, weight, total_value, total_weight, \ - color_weight, range_weight, diff - double dist_scale = bins / max_value + Returns + ------- + denoised : ndarray + Denoised image. - for r in range(rows): - for c in range(cols): - pixel_addr = r * cols + c - total_value = 0 - total_weight = 0 - centre = image_data[pixel_addr] - for wr in range(-window_ext, window_ext + 1): - rr = wr + r - kr = wr + window_ext - for wc in range(-window_ext, window_ext + 1): - cc = wc + c - kc = wc + window_ext + References + ---------- + .. [1] http://users.soe.ucsc.edu/~manduchi/Papers/ICCV98.pdf - value = get_pixel2d(image_data, rows, cols, - rr, cc, mode, cval) - diff = fabs(centre - value) + """ - range_weight = range_lut[kr * win_size + kc] - color_weight = color_lut[(diff * dist_scale)] - - weight = range_weight * color_weight - total_value += value * weight - total_weight += weight - - out_data[pixel_addr] = total_value / total_weight - - free(color_lut) - free(range_lut) - - return out - - -def _denoise_bilateral3d(cnp.ndarray[dtype=cnp.double_t, ndim=3, mode='c'] image, - int win_size, double sigma_color, - double sigma_range, int bins, char mode, - double cval): + image = np.atleast_3d(img_as_float(image)) cdef: Py_ssize_t rows = image.shape[0] @@ -112,22 +103,35 @@ def _denoise_bilateral3d(cnp.ndarray[dtype=cnp.double_t, ndim=3, mode='c'] image double max_value = image.max() + cnp.ndarray[dtype=cnp.double_t, ndim=3, mode='c'] cimage = \ + np.ascontiguousarray(image) cnp.ndarray[dtype=cnp.double_t, ndim=3, mode='c'] out = \ np.zeros((rows, cols, dims), dtype=np.double) - double* image_data = image.data + double* image_data = cimage.data double* out_data = out.data - double* color_lut = _compute_color_lut(bins, sigma_color, max_value) - double* range_lut = _compute_range_lut(win_size, sigma_range) + double* color_lut = _compute_color_lut(bins, sigma_range, max_value) + double* range_lut = _compute_range_lut(win_size, sigma_spatial) Py_ssize_t r, c, d, wr, wc, kr, kc, rr, cc, pixel_addr - double value, weight, dist, total_weight, color_weight, range_weight + double value, weight, dist, total_weight, csigma_range, color_weight, \ + range_weight double dist_scale = bins / dims / max_value double* values = malloc(dims * sizeof(double)) double* centres = malloc(dims * sizeof(double)) double* total_values = malloc(dims * sizeof(double)) + if sigma_range is None: + csigma_range = image.std() + else: + csigma_range = sigma_range + + if mode not in ('constant', 'wrap', 'reflect', 'nearest'): + raise ValueError("Invalid mode specified. Please use " + "`constant`, `nearest`, `wrap` or `reflect`.") + cdef char cmode = ord(mode[0].upper()) + for r in range(rows): for c in range(cols): pixel_addr = r * cols * dims + c * dims @@ -147,7 +151,7 @@ def _denoise_bilateral3d(cnp.ndarray[dtype=cnp.double_t, ndim=3, mode='c'] image dist = 0 for d in range(dims): value = get_pixel3d(image_data, rows, cols, dims, - rr, cc, d, mode, cval) + rr, cc, d, cmode, cval) values[d] = value dist += (centres[d] - value)**2 dist = sqrt(dist) diff --git a/skimage/filter/denoise.py b/skimage/filter/denoise.py index d7c96f90..d62f8b27 100644 --- a/skimage/filter/denoise.py +++ b/skimage/filter/denoise.py @@ -244,70 +244,3 @@ def denoise_tv(im, weight=50, eps=2.e-4, n_iter_max=200): tv_denoise = deprecated('skimage.filter.denoise_tv')(denoise_tv) - - -def denoise_bilateral(image, win_size=5, sigma_color=1, sigma_range=1, bins=1e4, - mode='constant', cval=0): - """Denoise image using bilateral filter. - - This is an edge-preserving and noise reducing denoising filter. It averages - pixels based on their spatial closeness and radiometric similarity. - - Spatial closeness is measured by the gaussian function of the euclidian - distance between two pixels and a certain standard deviation - (`sigma_range`). - - Radiometric similarity is measured by the gaussian function of the euclidian - distance between two color values and a certain standard deviation - (`sigma_color`). - - Parameters - ---------- - image : ndarray - Input image. - win_size : int - Window size for filtering. - sigma_color : float - Standard deviation for color distance. A larger value results in - averaging of pixels with larger color differences. - sigma_range : float - Standard deviation for range distance. A larger value results in - averaging of pixels with larger spatial differences. - bins : int - Number of discrete values for gaussian weights of color filtering. - A larger value results in improved accuracy. - mode : string - How to handle values outside the image borders. See - `scipy.ndimage.map_coordinates` for detail. - cval : string - Used in conjunction with mode 'constant', the value outside - the image boundaries. - - Returns - ------- - denoised : ndarray - Denoised image. - - References - ---------- - .. [1] http://users.soe.ucsc.edu/~manduchi/Papers/ICCV98.pdf - - """ - - # not using img_as_float to preserve original range of values, which is - # necessary so sigma_color is applied as user desires - image = np.array(image, dtype=np.double) - - if mode not in ('constant', 'wrap', 'reflect', 'nearest'): - raise ValueError("Invalid mode specified. Please use " - "`constant`, `nearest`, `wrap` or `reflect`.") - mode = ord(mode[0].upper()) - - if image.ndim == 2 or (image.ndim == 3 and image.shape[2] == 1): - if image.ndim == 3 and image.shape[2] == 1: - image = np.squeeze(image) - func = _denoise._denoise_bilateral2d - else: - func = _denoise._denoise_bilateral3d - image = np.ascontiguousarray(image) - return func(image, win_size, sigma_color, sigma_range, bins, mode, cval) diff --git a/skimage/filter/tests/test_denoise.py b/skimage/filter/tests/test_denoise.py index b8e6c9ef..63a5a5e0 100644 --- a/skimage/filter/tests/test_denoise.py +++ b/skimage/filter/tests/test_denoise.py @@ -64,8 +64,8 @@ def test_denoise_bilateral_2d(): img += 0.5 * img.std() * np.random.random(img.shape) img = np.clip(img, 0, 1) - out1 = filter.denoise_bilateral(img, sigma_color=0.1, sigma_range=20) - out2 = filter.denoise_bilateral(img, sigma_color=0.2, sigma_range=30) + out1 = filter.denoise_bilateral(img, sigma_range=0.1, sigma_spatial=20) + out2 = filter.denoise_bilateral(img, sigma_range=0.2, sigma_spatial=30) # make sure noise is reduced assert img.std() > out1.std() @@ -78,8 +78,8 @@ def test_denoise_bilateral_3d(): img += 0.5 * img.std() * np.random.random(img.shape) img = np.clip(img, 0, 1) - out1 = filter.denoise_bilateral(img, sigma_color=0.1, sigma_range=20) - out2 = filter.denoise_bilateral(img, sigma_color=0.2, sigma_range=30) + out1 = filter.denoise_bilateral(img, sigma_range=0.1, sigma_spatial=20) + out2 = filter.denoise_bilateral(img, sigma_range=0.2, sigma_spatial=30) # make sure noise is reduced assert img.std() > out1.std() From 2cdb3896800a4466e76a29a31138ca026d7a0db6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 17 Oct 2012 16:29:32 +0200 Subject: [PATCH 76/81] Remove unused import --- skimage/filter/denoise.py | 1 - 1 file changed, 1 deletion(-) diff --git a/skimage/filter/denoise.py b/skimage/filter/denoise.py index d62f8b27..351b2482 100644 --- a/skimage/filter/denoise.py +++ b/skimage/filter/denoise.py @@ -1,7 +1,6 @@ import numpy as np from skimage import img_as_float from skimage._shared.utils import deprecated -import _denoise def _denoise_tv_3d(im, weight=100, eps=2.e-4, n_iter_max=200): From dd421dcc80e14157a0a4e8f6f557201b425713ec Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 17 Oct 2012 16:32:31 +0200 Subject: [PATCH 77/81] Add note about range of values of sigma_range parameter --- skimage/filter/_denoise.pyx | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/skimage/filter/_denoise.pyx b/skimage/filter/_denoise.pyx index bda46b0d..b60a5a85 100644 --- a/skimage/filter/_denoise.pyx +++ b/skimage/filter/_denoise.pyx @@ -68,7 +68,9 @@ def denoise_bilateral(image, int win_size=5, sigma_range=None, sigma_range : float Standard deviation for grayvalue/color distance (radiometric similarity). A larger value results in averaging of pixels with larger - radiometric differences. + radiometric differences. Note, that the image will be converted using + the `img_as_float` function and thus the standard deviation is in + respect to the range `[0, 1]`. sigma_spatial : float Standard deviation for range distance. A larger value results in averaging of pixels with larger spatial differences. From a41163beb0bd63194f58a03faf5563ae8fe60365 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Wed, 17 Oct 2012 16:45:25 +0200 Subject: [PATCH 78/81] Add Cython denoise source file to bento file --- bento.info | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/bento.info b/bento.info index 50a2743a..55b3690d 100644 --- a/bento.info +++ b/bento.info @@ -64,7 +64,10 @@ Library: Extension: skimage.filter._ctmf Sources: skimage/filter/_ctmf.pyx - Extension: skimage.morphology.ccomp + Extension: skimage.filter._denoise + Sources: + skimage/filter/_ctmf.pyx + Extension: skimage.morphology.denoise Sources: skimage/morphology/ccomp.pyx Extension: skimage.morphology._watershed From 8347bd449fc137cbbc986461b3f4aa5c68c2137e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Johannes=20Sch=C3=B6nberger?= Date: Thu, 18 Oct 2012 17:10:07 +0200 Subject: [PATCH 79/81] Replace deprecated function call --- doc/examples/plot_denoise.py | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/examples/plot_denoise.py b/doc/examples/plot_denoise.py index a3e83a65..8f02f21b 100644 --- a/doc/examples/plot_denoise.py +++ b/doc/examples/plot_denoise.py @@ -30,7 +30,7 @@ import numpy as np import matplotlib.pyplot as plt from skimage import data, color, img_as_float -from skimage.filter import tv_denoise, denoise_bilateral +from skimage.filter import denoise_tv, denoise_bilateral lena = img_as_float(data.lena()) lena = lena[220:300, 220:320] @@ -43,14 +43,14 @@ fig, ax = plt.subplots(nrows=2, ncols=3, figsize=(8, 5)) ax[0, 0].imshow(noisy) ax[0, 0].axis('off') ax[0, 0].set_title('noisy') -ax[0, 1].imshow(tv_denoise(noisy, weight=0.1)) +ax[0, 1].imshow(denoise_tv(noisy, weight=0.1)) ax[0, 1].axis('off') ax[0, 1].set_title('TV') ax[0, 2].imshow(denoise_bilateral(noisy, sigma_range=0.03, sigma_spatial=15)) ax[0, 2].axis('off') ax[0, 2].set_title('Bilateral') -ax[1, 0].imshow(tv_denoise(noisy, weight=0.2)) +ax[1, 0].imshow(denoise_tv(noisy, weight=0.2)) ax[1, 0].axis('off') ax[1, 0].set_title('(more) TV') ax[1, 1].imshow(denoise_bilateral(noisy, sigma_range=0.06, sigma_spatial=15)) From ea8e98f707de2eaeafa8fbe4b65424f2bb155554 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Thu, 18 Oct 2012 12:36:25 -0700 Subject: [PATCH 80/81] PKG: Fix bento build. --- bento.info | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/bento.info b/bento.info index 55b3690d..bd831849 100644 --- a/bento.info +++ b/bento.info @@ -66,8 +66,8 @@ Library: skimage/filter/_ctmf.pyx Extension: skimage.filter._denoise Sources: - skimage/filter/_ctmf.pyx - Extension: skimage.morphology.denoise + skimage/filter/_denoise.pyx + Extension: skimage.morphology.ccomp Sources: skimage/morphology/ccomp.pyx Extension: skimage.morphology._watershed From 6c5b40302dc4c36a3cd8fe516fcb200f4b252c50 Mon Sep 17 00:00:00 2001 From: Stefan van der Walt Date: Wed, 24 Oct 2012 14:21:47 -0700 Subject: [PATCH 81/81] ENH: Add motion blurred clock image. --- skimage/data/__init__.py | 13 +++++++++++++ skimage/data/clock_motion.png | Bin 0 -> 58784 bytes skimage/data/tests/test_data.py | 5 +++++ 3 files changed, 18 insertions(+) create mode 100644 skimage/data/clock_motion.png diff --git a/skimage/data/__init__.py b/skimage/data/__init__.py index 5e51d353..d2fba7db 100644 --- a/skimage/data/__init__.py +++ b/skimage/data/__init__.py @@ -114,3 +114,16 @@ def page(): """ return load("page.png") + + +def clock(): + """Motion blurred clock. + + This photograph of a wall clock was taken while moving the camera in an + aproximately horizontal direction. It may be used to illustrate + inverse filters and deconvolution. + + Released into the public domain by the photographer (Stefan van der Walt). + + """ + return load("clock_motion.png") diff --git a/skimage/data/clock_motion.png b/skimage/data/clock_motion.png new file mode 100644 index 0000000000000000000000000000000000000000..3a81bd748692b0c4e3a44199c2c9b872db0e3b73 GIT binary patch literal 58784 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 literal 0 HcmV?d00001 diff --git a/skimage/data/tests/test_data.py b/skimage/data/tests/test_data.py index b5f6bcaa..f660c69c 100644 --- a/skimage/data/tests/test_data.py +++ b/skimage/data/tests/test_data.py @@ -34,6 +34,11 @@ def test_page(): data.page() +def test_page(): + """ Test that "clock" image can be loaded. """ + data.clock() + + if __name__ == "__main__": from numpy.testing import run_module_suite run_module_suite()