use xlwings to dump data (to be able to handle special values like NaN, dates, ...) but win32com to generate graphical elements

Author: alixdamman

larray/inout/xw_reporting.py

@@ -297,13 +297,13 @@ def __init__(self, text, fontsize, top, left, width, height):
             self.fontsize = _positive_integer(fontsize)
 
         def dump(self, sheet, data_sheet, row):
-            data_cells = data_sheet.Cells
+            data_cells = data_sheet.cells
             # add title in data sheet
-            data_cells(row, 1).Value = self.text
+            data_cells(row, 1).value = self.text
             # generate title banner in destination sheet
             msoShapeRectangle = 1
             msoThemeColorBackground1 = 14
-            sheet_shapes = sheet.Shapes
+            sheet_shapes = sheet.shapes.api
             shp = sheet_shapes.AddShape(Type=msoShapeRectangle, Left=self.left, Top=self.top,
                                             Width=self.width, Height=self.height)
             fill = shp.Fill
@@ -323,7 +323,6 @@ def dump(self, sheet, data_sheet, row):
             # update and return current row position
             return row + 2
 
-    # TODO: fix problem with nans values
     class ExcelGraphItem(AbstractExcelItem):
 
         _default_size = ItemSize(427, 230)
@@ -341,23 +340,26 @@ def __init__(self, title, data, template, top, left, width, height):
             self.template = template
 
         def dump(self, sheet, data_sheet, row):
-            data_range = data_sheet.Range
-            data_cells = data_sheet.Cells
+            data_range = data_sheet.range
+            data_cells = data_sheet.cells
             # write graph title in data sheet
-            data_cells(row, 1).Value = self.title
+            data_cells(row, 1).value = self.title
             row += 1
             # dump data to make the graph in data sheet
             data = self.data
             nb_series = 1 if data.ndim == 1 else data.shape[0]
             nb_xticks = data.size if data.ndim == 1 else data.shape[1]
             last_row, last_col = row + nb_series, nb_xticks + 1
-            data_range(data_cells(row, 1), data_cells(last_row, last_col)).Value = data.dump()
-            data_cells(row, 1).Value = ''
+            data_range(data_cells(row, 1), data_cells(last_row, last_col)).value = data.dump()
+            data_cells(row, 1).value = ''
             # generate graph in destination sheet
-            sheet_charts = sheet.ChartObjects()
+            source = data_range(data_cells(row, 1), data_cells(last_row, last_col))
+            # Note: from here on, we use pure win32com objects instead of
+            #       larray.excel or xlwings objects as this is faster
+            source = source.api
+            sheet_charts = sheet.api.ChartObjects()
             obj = sheet_charts.Add(self.left, self.top, self.width, self.height)
             obj_chart = obj.Chart
-            source = data_range(data_cells(row, 1), data_cells(last_row, last_col))
             obj_chart.SetSourceData(source)
             obj_chart.ChartType = ChartType.xlLine
             obj_chart.HasTitle = True
@@ -466,23 +468,23 @@ def add_graph(self, title, data, template=None, width=None, height=None):
 
         def to_excel(self, filepath, data_sheet_name='__data__', overwrite=True):
             with open_excel(filepath, overwrite_file=overwrite) as wb:
-                # from here on, we use pure win32com objects instead of
-                # larray.excel or xlwings objects as this is faster
-                xl_wb = wb.api
+                app = wb.app.api
+                # it's a > x7 speed up difference
+                app.ScreenUpdating = False
 
                 # use first sheet as data sheet
-                data_sheet = xl_wb.Worksheets(1)
-                data_sheet.Name = data_sheet_name
-                data_cells = data_sheet.Cells
+                data_sheet = wb.sheets[0]
+                data_sheet.name = data_sheet_name
+                data_cells = data_sheet.cells
 
                 # dump items
                 row = 1
                 for dest_sheet_name, items in self.items.items():
                     # add new destination sheet
-                    dest_sheet = xl_wb.Worksheets.Add(After=xl_wb.Sheets(xl_wb.Sheets.Count))
-                    dest_sheet.Name = dest_sheet_name
+                    dest_sheet = wb.sheets.add(dest_sheet_name, after=wb[-1].xw_sheet)
+                    dest_sheet.name = dest_sheet_name
                     # write destination sheet name in data sheet
-                    data_cells(row, 1).Value = dest_sheet_name
+                    data_cells(row, 1).value = dest_sheet_name
                     row += 2
                     # dump items of current destination sheet
                     for item in items: