From 7b6ae7c9cac04efc522b6882307d8e5a07290cad Mon Sep 17 00:00:00 2001
From: Karamaz0V1 <florent.guiotte@gmail.com>
Date: Tue, 24 Apr 2018 15:51:00 +0200
Subject: [PATCH] Update software to new logging system

---
 ld2dap/AttributeProfiles.py | 13 ++++++++-----
 ld2dap/Differential.py      |  3 ++-
 ld2dap/LoadTIFF.py          |  2 +-
 ld2dap/ShowFig.py           |  1 +
 logging.yaml                |  2 +-
 5 files changed, 13 insertions(+), 8 deletions(-)

diff --git a/ld2dap/AttributeProfiles.py b/ld2dap/AttributeProfiles.py
index a350391..5a3bc6c 100644
--- a/ld2dap/AttributeProfiles.py
+++ b/ld2dap/AttributeProfiles.py
@@ -65,6 +65,8 @@ class AttributeProfiles(Filter):
         return att_len
 
     def _process(self, data, metadata):
+        self.logger.info('Compute Attribute Profiles on stack of size {}'.format(data.shape))
+
         t       = triskele.Triskele(data, verbose=False)
         att_min = t.filter(tree='min-tree', area=self.area,
                               standard_deviation=self.sd,
@@ -85,8 +87,8 @@ class AttributeProfiles(Filter):
         att_offset = self._process_offset()
         stack_offset = sum(att_offset.values())
         raster_offset = sum(att_len.values())
-        print('DEBUG: att offset: {}, att len: {}'.format(att_offset, att_len))
-        print('DEBUG: stack offset: {}, raster offset: {}'.format(stack_offset, raster_offset))
+        self.logger.debug('att offset: {}, att len: {}'.format(att_offset, att_len))
+        self.logger.debug('stack offset: {}, raster offset: {}'.format(stack_offset, raster_offset))
 
         ### Merge old and new descriptions
         metadata_new = list()
@@ -94,6 +96,7 @@ class AttributeProfiles(Filter):
         raster_list  = list()
         for stack in metadata:
             if stack.end - stack.begin > 1:
+                self.logger.err('Nested filtering, raising error')
                 raise NotImplementedError('Nested filtering not implemented yet')
 
             do = dso = 0
@@ -105,7 +108,7 @@ class AttributeProfiles(Filter):
                 al = att_len[att]
                 raster_list.append(att_min[:,:,sb+do+al:sb+do:-1])
                 raster_list.append(att_min[:,:,sb])
-                print('DEBUG: copying layer {}'.format(sb))
+                self.logger.debug('copying layer {}'.format(sb))
                 raster_list.append(att_max[:,:,sb+do+1:sb+do+al+1])
                 do += al
 
@@ -115,11 +118,11 @@ class AttributeProfiles(Filter):
                 dso += att_offset[att]
 
                 for old_desc, new_desc in zip(stack_new.desc, att_desc[att]):
-                    print('DESCRIPTION: {} > {}'.format(old_desc, new_desc))
+                    self.logger.debug('DESCRIPTION: {} > {}'.format(old_desc, new_desc))
                     old_desc.append(new_desc)
 
                 for old_symb, new_symb in zip(stack_new.symb, att_symb[att]):
-                    print('symbRIPTION: {} > {}'.format(old_symb, new_symb))
+                    self.logger.debug('symbRIPTION: {} > {}'.format(old_symb, new_symb))
                     old_symb.append(new_symb)
 
                 metadata_new.append(stack_new)
diff --git a/ld2dap/Differential.py b/ld2dap/Differential.py
index b5b008b..a906935 100644
--- a/ld2dap/Differential.py
+++ b/ld2dap/Differential.py
@@ -16,12 +16,13 @@ class Differential(Filter):
         super().__init__(self.__class__.__name__)
 
     def _process(self, data, metadata):
+        self.logger.info('Run differential on stack of size {}'.format(data.shape))
         raster_list = list()
         metadata_new = list()
 
         offset = 0
         for stack in metadata:
-            print('Differential: {}'.format(stack))
+            self.logger.debug('{}'.format(stack))
             raster_list.append(data[:,:,stack.begin+1:stack.end] -
                                data[:,:,stack.begin:stack.end-1])
 
diff --git a/ld2dap/LoadTIFF.py b/ld2dap/LoadTIFF.py
index 134c3c4..b8af96f 100644
--- a/ld2dap/LoadTIFF.py
+++ b/ld2dap/LoadTIFF.py
@@ -26,7 +26,7 @@ class LoadTIFF(Input):
         metadata = list()
 
         for i, file in enumerate(self.files):
-            print('Loading {}'.format(file))
+            self.logger.info('Loading {}'.format(file))
             layers.append(triskele.read(file))
             metadata.append(Stack(i, desc=file, symb='I_{{{}}}'.format(i)))
 
diff --git a/ld2dap/ShowFig.py b/ld2dap/ShowFig.py
index e4047a8..5481118 100644
--- a/ld2dap/ShowFig.py
+++ b/ld2dap/ShowFig.py
@@ -31,6 +31,7 @@ class ShowFig(Output):
             self._showfig(data, stack)
 
     def _showfig(self, data, stack):
+        self.logger.info('Display {}'.format(stack))
         fig_count = stack.end - stack.begin
 
         im_size = 2
diff --git a/logging.yaml b/logging.yaml
index cf50544..b18e6ed 100644
--- a/logging.yaml
+++ b/logging.yaml
@@ -7,7 +7,7 @@ formatters:
 handlers:
     console:
         class: logging.StreamHandler
-        level: DEBUG
+        level: INFO
         formatter: simple
         stream: ext://sys.stdout