From 488df4e32a5be35b1d766e725a90a4054de562fd Mon Sep 17 00:00:00 2001 From: Andreas Mueller Date: Sun, 30 Sep 2012 15:53:33 +0100 Subject: [PATCH] COSMIT some pep8 --- skimage/io/collection.py | 4 +++- skimage/transform/pyramids.py | 10 +++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/skimage/io/collection.py b/skimage/io/collection.py index d420b58d..5a5dfff6 100644 --- a/skimage/io/collection.py +++ b/skimage/io/collection.py @@ -11,6 +11,7 @@ from copy import copy import numpy as np from ._io import imread + def concatenate_images(ic): """Concatenate all images in the image collection into an array. @@ -66,6 +67,7 @@ def alphanumeric_key(s): k = [int(c) if c.isdigit() else c for c in re.split('([0-9]+)', s)] return k + class MultiImage(object): """A class containing a single multi-frame image. @@ -217,6 +219,7 @@ class MultiImage(object): """ return concatenate_images(self) + class ImageCollection(object): """Load and manage a collection of image files. @@ -428,4 +431,3 @@ class ImageCollection(object): If images in the `ImageCollection` don't have identical shapes. """ return concatenate_images(self) - diff --git a/skimage/transform/pyramids.py b/skimage/transform/pyramids.py index dd274834..ccace457 100644 --- a/skimage/transform/pyramids.py +++ b/skimage/transform/pyramids.py @@ -143,9 +143,9 @@ def pyramid_gaussian(image, max_layer=-1, downscale=2, sigma=None, order=1, the downscaled images. Note that the first image of the pyramid will be the original, unscaled - image. The total number of images is `max_layer + 1`. In case all layers are - computed, the last image is either a one-pixel image or the image where the - reduction does not change its shape. + image. The total number of images is `max_layer + 1`. In case all layers + are computed, the last image is either a one-pixel image or the image where + the reduction does not change its shape. Parameters ---------- @@ -225,8 +225,8 @@ def pyramid_laplacian(image, max_layer=-1, downscale=2, sigma=None, order=1, Note that the first image of the pyramid will be the difference between the original, unscaled image and its smoothed version. The total number of images is `max_layer + 1`. In case all layers are computed, the last image - is either a one-pixel image or the image where the reduction does not change - its shape. + is either a one-pixel image or the image where the reduction does not + change its shape. Parameters ----------