From 6026bd8b86eff6c3e2e51f31b0f4bdc2eab7ce66 Mon Sep 17 00:00:00 2001
From: Andre Anjos <andre.anjos@idiap.ch>
Date: Fri, 7 Jul 2017 10:24:07 +0200
Subject: [PATCH] Reflected changes from copper->crop renaming
---
.../vein/configurations/maximum_curvature.py | 4 +-
.../configurations/repeated_line_tracking.py | 4 +-
.../vein/configurations/wide_line_detector.py | 4 +-
bob/bio/vein/preprocessor/__init__.py | 9 +-
bob/bio/vein/preprocessor/cropper.py | 107 ------------------
5 files changed, 11 insertions(+), 117 deletions(-)
delete mode 100644 bob/bio/vein/preprocessor/cropper.py
diff --git a/bob/bio/vein/configurations/maximum_curvature.py b/bob/bio/vein/configurations/maximum_curvature.py
index 46c86ea..93e66ca 100644
--- a/bob/bio/vein/configurations/maximum_curvature.py
+++ b/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),
diff --git a/bob/bio/vein/configurations/repeated_line_tracking.py b/bob/bio/vein/configurations/repeated_line_tracking.py
index accd871..4099265 100644
--- a/bob/bio/vein/configurations/repeated_line_tracking.py
+++ b/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),
diff --git a/bob/bio/vein/configurations/wide_line_detector.py b/bob/bio/vein/configurations/wide_line_detector.py
index b82cf42..015663d 100644
--- a/bob/bio/vein/configurations/wide_line_detector.py
+++ b/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),
diff --git a/bob/bio/vein/preprocessor/__init__.py b/bob/bio/vein/preprocessor/__init__.py
index d9cb613..d0afb73 100644
--- a/bob/bio/vein/preprocessor/__init__.py
+++ b/bob/bio/vein/preprocessor/__init__.py
@@ -1,5 +1,5 @@
-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,
diff --git a/bob/bio/vein/preprocessor/cropper.py b/bob/bio/vein/preprocessor/cropper.py
deleted file mode 100644
index 1dc5454..0000000
--- a/bob/bio/vein/preprocessor/cropper.py
+++ /dev/null
@@ -1,107 +0,0 @@
-#!/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)
--
GitLab