Merge pull request #69 from kba/getlogger

getLogger per method

Author: bertsky

ocrd_cis/ocrd-tool.json

@@ -1,6 +1,6 @@
 {
 	"git_url": "https://github.com/cisocrgroup/ocrd_cis",
-	"version": "0.1.2",
+	"version": "0.1.3",
 	"tools": {
 		"ocrd-cis-ocropy-binarize": {
 			"executable": "ocrd-cis-ocropy-binarize",

ocrd_cis/ocropy/binarize.py

@@ -31,9 +31,9 @@
 #sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 TOOL = 'ocrd-cis-ocropy-binarize'
-LOG = getLogger('processor.OcropyBinarize')
 
 def binarize(pil_image, method='ocropy', maxskew=2, threshold=0.5, nrm=False, zoom=1.0):
+    LOG = getLogger('processor.OcropyBinarize')
     LOG.debug('binarizing %dx%d image with method=%s', pil_image.width, pil_image.height, method)
     if method == 'none':
         # useful if the images are already binary,
@@ -76,6 +76,7 @@ def __init__(self, *args, **kwargs):
         kwargs['ocrd_tool'] = self.ocrd_tool['tools'][TOOL]
         kwargs['version'] = self.ocrd_tool['version']
         super(OcropyBinarize, self).__init__(*args, **kwargs)
+        LOG = getLogger('processor.OcropyBinarize')
         if hasattr(self, 'output_file_grp'):
             if self.parameter['grayscale'] and self.parameter['method'] != 'ocropy':
                 LOG.critical('requested method %s does not support grayscale normalized output',
@@ -104,6 +105,7 @@ def process(self):
 
         Produce a new output file by serialising the resulting hierarchy.
         """
+        LOG = getLogger('processor.OcropyBinarize')
         level = self.parameter['level-of-operation']
         assert_file_grp_cardinality(self.input_file_grp, 1)
         assert_file_grp_cardinality(self.output_file_grp, 1)
@@ -181,6 +183,7 @@ def process(self):
                      file_id, self.output_file_grp, out.local_filename)
 
     def process_page(self, page, page_image, page_xywh, zoom, page_id, file_id):
+        LOG = getLogger('processor.OcropyBinarize')
         LOG.info("About to binarize page '%s'", page_id)
         features = page_xywh['features']
         if 'angle' in page_xywh and page_xywh['angle']:
@@ -226,6 +229,7 @@ def process_page(self, page, page_image, page_xywh, zoom, page_id, file_id):
             comments=features))
 
     def process_region(self, region, region_image, region_xywh, zoom, page_id, file_id):
+        LOG = getLogger('processor.OcropyBinarize')
         LOG.info("About to binarize page '%s' region '%s'", page_id, region.id)
         features = region_xywh['features']
         if 'angle' in region_xywh and region_xywh['angle']:
@@ -273,6 +277,7 @@ def process_region(self, region, region_image, region_xywh, zoom, page_id, file_
             comments=features))
 
     def process_line(self, line, line_image, line_xywh, zoom, page_id, region_id, file_id):
+        LOG = getLogger('processor.OcropyBinarize')
         LOG.info("About to binarize page '%s' region '%s' line '%s'",
                  page_id, region_id, line.id)
         features = line_xywh['features']

ocrd_cis/ocropy/clip.py

@@ -35,7 +35,6 @@
 )
 
 TOOL = 'ocrd-cis-ocropy-clip'
-LOG = getLogger('processor.OcropyClip')
 
 class OcropyClip(Processor):
 
@@ -80,6 +79,7 @@ def process(self):
         # too. However, region-level clipping _must_ be run before region-level
         # deskewing, because that would make segments incomensurable with their
         # neighbours.
+        LOG = getLogger('processor.OcropyClip')
         level = self.parameter['level-of-operation']
         assert_file_grp_cardinality(self.input_file_grp, 1)
         assert_file_grp_cardinality(self.output_file_grp, 1)
@@ -226,6 +226,7 @@ def process(self):
     def process_segment(self, segment, segment_mask, segment_polygon, neighbours,
                         background_image, parent_image, parent_coords, parent_bin,
                         page_id, file_id):
+        LOG = getLogger('processor.OcropyClip')
         # initialize AlternativeImage@comments classes from parent, except
         # for those operations that can apply on multiple hierarchy levels:
         features = ','.join(

ocrd_cis/ocropy/denoise.py

@@ -22,7 +22,6 @@
     remove_noise)
 
 TOOL = 'ocrd-cis-ocropy-denoise'
-LOG = getLogger('processor.OcropyDenoise')
 
 class OcropyDenoise(Processor):
 
@@ -53,6 +52,7 @@ def process(self):
 
         Produce a new output file by serialising the resulting hierarchy.
         """
+        LOG = getLogger('processor.OcropyDenoise')
         level = self.parameter['level-of-operation']
         assert_file_grp_cardinality(self.input_file_grp, 1)
         assert_file_grp_cardinality(self.output_file_grp, 1)
@@ -133,6 +133,7 @@ def process(self):
                      file_id, self.output_file_grp, out.local_filename)
 
     def process_segment(self, segment, segment_image, segment_xywh, zoom, page_id, file_id):
+        LOG = getLogger('processor.OcropyDenoise')
         LOG.info("About to despeckle '%s'", file_id)
         bin_image = remove_noise(segment_image,
                                  maxsize=self.parameter['noise_maxsize']/zoom*300/72) # in pt

ocrd_cis/ocropy/deskew.py

@@ -26,7 +26,6 @@
 #sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 TOOL = 'ocrd-cis-ocropy-deskew'
-LOG = getLogger('processor.OcropyDeskew')
 
 def deskew(pil_image, maxskew=2):
     array = pil2array(pil_image)
@@ -59,6 +58,7 @@ def process(self):
 
         Produce a new output file by serialising the resulting hierarchy.
         """
+        LOG = getLogger('processor.OcropyDeskew')
         level = self.parameter['level-of-operation']
         assert_file_grp_cardinality(self.input_file_grp, 1)
         assert_file_grp_cardinality(self.output_file_grp, 1)
@@ -124,6 +124,7 @@ def process(self):
                      file_id, self.output_file_grp, out.local_filename)
 
     def _process_segment(self, segment, segment_image, segment_coords, segment_id, page_id, file_id):
+        LOG = getLogger('processor.OcropyDeskew')
         angle0 = segment_coords['angle'] # deskewing (w.r.t. top image) already applied to segment_image
         LOG.info("About to deskew %s", segment_id)
         angle = deskew(segment_image, maxskew=self.parameter['maxskew']) # additional angle to be applied

ocrd_cis/ocropy/dewarp.py

@@ -27,7 +27,6 @@
 #sys.path.append(os.path.dirname(os.path.abspath(__file__)))
 
 TOOL = 'ocrd-cis-ocropy-dewarp'
-LOG = getLogger('processor.OcropyDewarp')
 
 class InvalidLine(Exception):
     """Line image does not allow dewarping and should be ignored."""
@@ -100,6 +99,7 @@ def process(self):
 
         Produce a new output file by serialising the resulting hierarchy.
         """
+        LOG = getLogger('processor.OcropyDewarp')
         assert_file_grp_cardinality(self.input_file_grp, 1)
         assert_file_grp_cardinality(self.output_file_grp, 1)
 

ocrd_cis/ocropy/recognize.py

@@ -32,7 +32,6 @@
 )
 
 TOOL = 'ocrd-cis-ocropy-recognize'
-LOG = getLogger('processor.OcropyRecognize')
 
 def resize_keep_ratio(image, baseheight=48):
     scale = baseheight / image.height
@@ -132,6 +131,7 @@ def process(self):
 
         Produce a new output file by serialising the resulting hierarchy.
         """
+        LOG = getLogger('processor.OcropyRecognize')
 
         assert_file_grp_cardinality(self.input_file_grp, 1)
         assert_file_grp_cardinality(self.output_file_grp, 1)
@@ -191,6 +191,7 @@ def process(self):
                      file_id, self.output_file_grp, out.local_filename)
 
     def process_regions(self, regions, maxlevel, page_image, page_coords):
+        LOG = getLogger('processor.OcropyRecognize')
         edits = 0
         lengs = 0
         for region in regions:
@@ -214,6 +215,7 @@ def process_regions(self, regions, maxlevel, page_image, page_coords):
             LOG.info('CER: %.1f%%', 100.0 * edits / lengs)
 
     def process_lines(self, textlines, maxlevel, region_image, region_coords):
+        LOG = getLogger('processor.OcropyRecognize')
         edits = 0
         lengs = 0
         for line in textlines:

ocrd_cis/ocropy/resegment.py

@@ -37,7 +37,6 @@
 
 
 TOOL = 'ocrd-cis-ocropy-resegment'
-LOG = getLogger('processor.OcropyResegment')
 
 def resegment(line_polygon, region_labels, region_bin, line_id,
               extend_margins=3,
@@ -57,6 +56,7 @@ def resegment(line_polygon, region_labels, region_bin, line_id,
     If ``extend_margins`` is larger than zero, then extend ``line_polygon``
     by that amount of pixels horizontally and vertically before.
     """
+    LOG = getLogger('processor.OcropyResegment')
     # height, width = region_labels.shape
     # mask from line polygon:
     line_mask = np.zeros_like(region_labels)
@@ -144,6 +144,7 @@ def process(self):
 
         Produce a new output file by serialising the resulting hierarchy.
         """
+        LOG = getLogger('processor.OcropyResegment')
         # This makes best sense for bad/coarse line segmentation, like current GT
         # or as postprocessing for bbox-only steps.
         # Most notably, it can convert rectangles to polygons (polygonalization).

ocrd_cis/ocropy/segment.py

@@ -55,7 +55,6 @@
 )
 
 TOOL = 'ocrd-cis-ocropy-segment'
-LOG = getLogger('processor.OcropySegment')
 
 def masks2polygons(bg_labels, fg_bin, name, min_area=None, simplify=False):
     """Convert label masks into polygon coordinates.
@@ -71,6 +70,7 @@ def masks2polygons(bg_labels, fg_bin, name, min_area=None, simplify=False):
 
     Return these polygons as a list of label, polygon tuples.
     """
+    LOG = getLogger('processor.OcropySegment')
     results = list()
     for label in np.unique(bg_labels):
         if not label:
@@ -197,6 +197,7 @@ def process(self):
         
         Produce a new output file by serialising the resulting hierarchy.
         """
+        LOG = getLogger('processor.OcropySegment')
         # FIXME: allow passing a-priori info on reading order / textline order
         # (and then pass on as ``bt`` and ``rl``; however, there may be a mixture
         #  of different scripts; also, vertical writing needs internal rotation
@@ -412,6 +413,7 @@ def _process_element(self, element, ignore, image, coords, element_id, file_id,
         in full page/table mode, then combine all separators among them with the
         newly detected separators to guide region segmentation.
         """
+        LOG = getLogger('processor.OcropySegment')
         element_array = pil2array(image)
         element_bin = np.array(element_array <= midrange(element_array), np.bool)
         sep_bin = np.zeros_like(element_bin, np.bool)
@@ -763,6 +765,7 @@ def page_subgroup_in_reading_order(roelem):
     
     Return the new group object.
     """
+    LOG = getLogger('processor.OcropySegment')
     if not roelem:
         LOG.error('Cannot subgroup from empty ReadingOrder element')
         return roelem