Added merge border lines, text color adjustment

Author: clittle

layers/exporters/excel_templates.py

@@ -78,9 +78,20 @@ def _build_raw(self, showName=True, showID=False, sort=0, scores=[], subtechs=[]
         for col, value in dims.items():
             sheet_handle.column_dimensions[col].width = value
 
+        merge_border_thickness = 'thin'
+        merge_template_l = Border(bottom=Side(border_style=merge_border_thickness),
+                                  left=Side(border_style=merge_border_thickness),
+                                  top=Side(border_style=merge_border_thickness))
+        merge_template_r = Border(bottom=Side(border_style=merge_border_thickness),
+                                  right=Side(border_style=merge_border_thickness),
+                                  top=Side(border_style=merge_border_thickness))
+
         for marker in joins:
             sheet_handle.merge_cells(start_row=marker[0], start_column=marker[1], end_row=marker[0] + marker[2] - 1,
                                      end_column=marker[1])
+            for block in range(marker[0], marker[0] + marker[2]):
+                sheet_handle[block][marker[1]].border = merge_template_r
+                sheet_handle[block][marker[0] + 1].border = merge_template_l
             sheet_handle.merge_cells(start_row=1, start_column=marker[1], end_row=1, end_column=marker[1] + 1)
             adjust = sheet_handle.cell(row=marker[0], column=marker[1])
             adjust.alignment = Alignment(vertical='top')

layers/exporters/to_excel.py

@@ -1,5 +1,6 @@
 from openpyxl.comments import Comment
 from openpyxl.styles import PatternFill, Font
+import colorsys
 
 try:
     from core import Layer
@@ -115,4 +116,9 @@ def to_xlsx(self, layer, filepath="layer.xlsx"):
                         comp_color = layer.layer.gradient.compute_color(tech.score)
                         c_color = PatternFill(fill_type='solid', start_color=comp_color.upper()[1:])
                         cell.fill = c_color
+                        RGB = tuple(int(comp_color.upper()[1:][i:i+2], 16) for i in (0, 2, 4))
+                        hls = colorsys.rgb_to_hls(RGB[0], RGB[1], RGB[2])
+                        if hls[1] < 127.5:
+                            white = Font(color='FFFFFF')
+                            cell.font = white
         raw_template.save(filepath)