Make verafinger file load both image and mask from annotations

bob/bio/vein/database/verafinger.py

@@ -7,72 +7,81 @@ from bob.bio.base.database import BioFile, BioDatabase
 
 
 class File(BioFile):
-    """
-    Implements extra properties of vein files for the Vera Fingervein database
+  """
+  Implements extra properties of vein files for the Vera Fingervein database
 
 
-    Parameters:
+  Parameters:
 
-      f (object): Low-level file (or sample) object that is kept inside
+    f (object): Low-level file (or sample) object that is kept inside
 
-    """
+  """
 
-    def __init__(self, f):
+  def __init__(self, f):
 
-        super(File, self).__init__(client_id=f.model_id, path=f.path,
-            file_id=f.id)
-        self.__f = f
+    super(File, self).__init__(client_id=f.model_id, path=f.path,
+        file_id=f.id)
+    self.__f = f
 
 
-    def roi(self):
-        """Returns the binary mask from the ROI annotations available"""
-        from ..preprocessor.utils import poly_to_mask
+  def mask(self):
+    """Returns the binary mask from the ROI annotations available"""
 
-        # The size of images in this database is (250, 665) pixels (h, w)
-        return poly_to_mask((250, 665), self.__f.roi())
+    from ..preprocessor.utils import poly_to_mask
+
+    # The size of images in this database is (250, 665) pixels (h, w)
+    return poly_to_mask((250, 665), self.__f.roi())
+
+
+  def load(self, *args, **kwargs):
+    """(Overrides base method) Loads both image and mask"""
+
+    image = super(File, self).load(*args, **kwargs)
+
+    return image, self.mask()
 
 
 
 class Database(BioDatabase):
-    """
-    Implements verification API for querying Vera Fingervein database.
-    """
+  """
+  Implements verification API for querying Vera Fingervein database.
+  """
 
-    def __init__(self, **kwargs):
+  def __init__(self, **kwargs):
 
-        super(Database, self).__init__(name='verafinger', **kwargs)
-        from bob.db.verafinger.query import Database as LowLevelDatabase
-        self.__db = LowLevelDatabase()
+    super(Database, self).__init__(name='verafinger', **kwargs)
+    from bob.db.verafinger.query import Database as LowLevelDatabase
+    self.__db = LowLevelDatabase()
 
-        self.low_level_group_names = ('train', 'dev')
-        self.high_level_group_names = ('world', 'dev')
+    self.low_level_group_names = ('train', 'dev')
+    self.high_level_group_names = ('world', 'dev')
 
 
-    def groups(self):
+  def groups(self):
 
-        return self.convert_names_to_highlevel(self.__db.groups(),
-            self.low_level_group_names, self.high_level_group_names)
+    return self.convert_names_to_highlevel(self.__db.groups(),
+        self.low_level_group_names, self.high_level_group_names)
 
 
-    def client_id_from_model_id(self, model_id, group='dev'):
-        """Required as ``model_id != client_id`` on this database"""
+  def client_id_from_model_id(self, model_id, group='dev'):
+      """Required as ``model_id != client_id`` on this database"""
 
-        return self.__db.finger_name_from_model_id(model_id)
+    return self.__db.finger_name_from_model_id(model_id)
 
 
-    def model_ids_with_protocol(self, groups=None, protocol=None, **kwargs):
+  def model_ids_with_protocol(self, groups=None, protocol=None, **kwargs):
 
-        groups = self.convert_names_to_lowlevel(groups,
-            self.low_level_group_names, self.high_level_group_names)
-        return self.__db.model_ids(groups=groups, protocol=protocol)
+    groups = self.convert_names_to_lowlevel(groups,
+        self.low_level_group_names, self.high_level_group_names)
+    return self.__db.model_ids(groups=groups, protocol=protocol)
 
 
-    def objects(self, groups=None, protocol=None, purposes=None,
-        model_ids=None, **kwargs):
+  def objects(self, groups=None, protocol=None, purposes=None,
+      model_ids=None, **kwargs):
 
-        groups = self.convert_names_to_lowlevel(groups,
-            self.low_level_group_names, self.high_level_group_names)
-        retval = self.__db.objects(groups=groups, protocol=protocol,
-            purposes=purposes, model_ids=model_ids, **kwargs)
+    groups = self.convert_names_to_lowlevel(groups,
+        self.low_level_group_names, self.high_level_group_names)
+    retval = self.__db.objects(groups=groups, protocol=protocol,
+        purposes=purposes, model_ids=model_ids, **kwargs)
 
-        return [File(f) for f in retval]
+    return [File(f) for f in retval]