Reflected changes from copper->crop renaming

bob/bio/vein/configurations/maximum_curvature.py

@@ -20,7 +20,7 @@ or the attribute ``sub_directory`` in a configuration file loaded **after**
 this resource.
 """
 
-from ..preprocessor import NoCropper, Padder, TomesLeeMask, \
+from ..preprocessor import NoCrop, Padder, TomesLeeMask, \
     HuangNormalization, NoFilter, Preprocessor
 
 # Filter sizes for the vertical "high-pass" filter
@@ -32,7 +32,7 @@ PAD_WIDTH = 5
 PAD_CONST = 51
 
 preprocessor = Preprocessor(
-    crop=NoCropper(),
+    crop=NoCrop(),
     mask=TomesLeeMask(filter_height=FILTER_HEIGHT, filter_width=FILTER_WIDTH),
     normalize=HuangNormalization(padding_width=PAD_WIDTH,
       padding_constant=PAD_CONST),

bob/bio/vein/configurations/repeated_line_tracking.py

@@ -20,7 +20,7 @@ or the attribute ``sub_directory`` in a configuration file loaded **after**
 this resource.
 """
 
-from ..preprocessor import NoCropper, Padder, TomesLeeMask, \
+from ..preprocessor import NoCrop, Padder, TomesLeeMask, \
     HuangNormalization, NoFilter, Preprocessor
 
 # Filter sizes for the vertical "high-pass" filter
@@ -32,7 +32,7 @@ PAD_WIDTH = 5
 PAD_CONST = 51
 
 preprocessor = Preprocessor(
-    crop=NoCropper(),
+    crop=NoCrop(),
     mask=TomesLeeMask(filter_height=FILTER_HEIGHT, filter_width=FILTER_WIDTH),
     normalize=HuangNormalization(padding_width=PAD_WIDTH,
       padding_constant=PAD_CONST),

bob/bio/vein/configurations/wide_line_detector.py

@@ -20,7 +20,7 @@ or the attribute ``sub_directory`` in a configuration file loaded **after**
 this resource.
 """
 
-from ..preprocessor import NoCropper, Padder, TomesLeeMask, \
+from ..preprocessor import NoCrop, Padder, TomesLeeMask, \
     HuangNormalization, NoFilter, Preprocessor
 
 # Filter sizes for the vertical "high-pass" filter
@@ -32,7 +32,7 @@ PAD_WIDTH = 5
 PAD_CONST = 51
 
 preprocessor = Preprocessor(
-    crop=NoCropper(),
+    crop=NoCrop(),
     mask=TomesLeeMask(filter_height=FILTER_HEIGHT, filter_width=FILTER_WIDTH),
     normalize=HuangNormalization(padding_width=PAD_WIDTH,
       padding_constant=PAD_CONST),

bob/bio/vein/preprocessor/__init__.py

-from .cropper import Cropper, FixedCropper, NoCropper
-from .mask import Padder, Masker, FixedMask, AnnotatedRoIMask
+from .crop import Cropper, FixedCrop, NoCrop
+from .mask import Padder, Masker, FixedMask, NoMask, AnnotatedRoIMask
 from .mask import KonoMask, LeeMask, TomesLeeMask
 from .normalize import Normalizer, NoNormalization, HuangNormalization
 from .filters import Filter, NoFilter, HistogramEqualization
@@ -21,11 +21,12 @@ def __appropriate__(*args):
 
 __appropriate__(
     Cropper,
-    FixedCropper,
-    NoCropper,
+    FixedCrop,
+    NoCrop,
     Padder,
     Masker,
     FixedMask,
+    NoMask,
     AnnotatedRoIMask,
     KonoMask,
     LeeMask,

bob/bio/vein/preprocessor/cropper.py

-#!/usr/bin/env python
-# vim: set fileencoding=utf-8 :
-
-
-'''Base utilities for pre-cropping images'''
-
-import numpy
-
-
-class Cropper(object):
-    """This is the base class for all croppers
-
-    It defines the minimum requirements for all derived cropper classes.
-
-
-    """
-
-    def __init__(self):
-      pass
-
-
-    def __call__(self, image):
-      """Overwrite this method to implement your masking method
-
-
-      Parameters:
-
-        image (numpy.ndarray): A 2D numpy array of type ``uint8`` with the
-          input image
-
-
-      Returns:
-
-        numpy.ndarray: A 2D numpy array of the same type as the input, with
-        cropped rows and columns as per request
-
-      """
-
-      raise NotImplemented('You must implement the __call__ slot')
-
-
-class FixedCropper(object):
-  """Implements cropping using a fixed suppression of border pixels
-
-  The defaults supress no lines from the image and returns an image like the
-  original.
-
-
-  .. note::
-
-     Before choosing values, note you're responsible for knowing what is the
-     orientation of images fed into this cropper.
-
-
-  Parameters:
-
-    top (:py:class:`int`, optional): Number of lines to suppress from the top
-      of the image. The top of the image corresponds to ``y = 0``.
-
-    bottom (:py:class:`int`, optional): Number of lines to suppress from the
-      bottom of the image. The bottom of the image corresponds to ``y =
-      height``.
-
-    left (:py:class:`int`, optional): Number of lines to suppress from the left
-      of the image. The left of the image corresponds to ``x = 0``.
-
-    right (:py:class:`int`, optional): Number of lines to suppress from the
-      right of the image. The right of the image corresponds to ``x = width``.
-
-  """
-
-  def __init__(self, top=0, bottom=0, left=0, right=0):
-    self.top = top
-    self.bottom = bottom
-    self.left = left
-    self.right = right
-
-
-  def __call__(self, image):
-    """Returns a big mask
-
-
-    Parameters:
-
-      image (numpy.ndarray): A 2D numpy array of type ``uint8`` with the
-        input image
-
-
-    Returns:
-
-      numpy.ndarray: A 2D numpy array of type boolean with the caculated
-      mask. ``True`` values correspond to regions where the finger is
-      situated
-
-
-    """
-
-    # this should work even if limits are zeros
-    h, w = image.shape
-    return image[self.top:h-self.bottom, self.left:w-self.right]
-
-
-class NoCropper(FixedCropper):
-  """Convenience: same as FixedCropper()"""
-
-  def __init__(self):
-    super(NoCropper, self).__init__(0, 0, 0, 0)