Add axis labels to same graphs in confinement report, format section …

…labels

lib/commons/rscommons/plotting.py

@@ -77,11 +77,16 @@ def box_plot(values, chart_title, file_path):
     plt.savefig(file_path)
 
 
-def histogram(values, bins, file_path):
+def histogram(values, bins, file_path, xlabel=None, ylabel=None):
 
     plt.clf()
     plt.hist(values, bins)
 
+    if xlabel is not None:
+        plt.xlabel(xlabel)
+    if ylabel is not None:
+        plt.ylabel(ylabel)
+
     if not os.path.isdir(os.path.dirname(file_path)):
         os.makedirs(os.path.dirname(file_path))
 

packages/confinement/confinement/confinement_report.py

@@ -63,7 +63,8 @@ def report_content(self):
         # charts and tables
         self.raw_confinement(section_out)
         for field in ['confinement_ratio', 'constriction_ratio']:
-            self.confinement_ratio(field, field, section_out)
+            format_label = field.replace('_', ' ').title()
+            self.confinement_ratio(field, format_label, section_out)
 
         outputs = list(realization.find('Outputs'))
         [self.layerprint(lyr, section_out, self.project_root) for lyr in outputs if lyr.tag in ['DEM', 'Raster', 'Vector', 'Geopackage']]
@@ -79,7 +80,7 @@ def confinement_ratio(self, db_field, label, parent=None):
 
         image_path = os.path.join(
             self.images_dir, '{}.png'.format(db_field.lower()))
-        histogram(data, 10, image_path)
+        histogram(data, 10, image_path, 'Confinement Ratio', 'Length (km)')
 
         img_wrap = ET.Element('div', attrib={'class': 'imgWrap'})
         img = ET.Element('img', attrib={