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

This reverts commit 3f041bb

Author: alixdamman

larray/inout/xw_reporting.py

@@ -468,13 +468,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.api
+            sheet_shapes = sheet.Shapes
             shp = sheet_shapes.AddShape(Type=msoShapeRectangle, Left=self.left, Top=self.top,
                                         Width=self.width, Height=self.height)
             fill = shp.Fill
@@ -496,6 +496,7 @@ def dump(self, sheet, data_sheet, row):
 
     _default_items_size['title'] = ExcelTitleItem._default_size
 
+    # TODO: fix problem with nans values
     class ExcelGraphItem(AbstractExcelItem):
 
         _default_size = ItemSize(427, 230)
@@ -513,26 +514,23 @@ 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
-            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()
+            sheet_charts = sheet.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
@@ -591,14 +589,14 @@ def newline(self):
 
         def _to_excel(self, workbook, data_row):
             # use first sheet as data sheet
-            data_sheet = workbook.sheets[0]
-            data_cells = data_sheet.cells
+            data_sheet = workbook.Worksheets(1)
+            data_cells = data_sheet.Cells
             # write destination sheet name in data sheet
-            data_cells(data_row, 1).value = self.name
+            data_cells(data_row, 1).Value = self.name
             data_row += 2
             # create new empty sheet in workbook (will contain output graphical items)
-            dest_sheet = workbook.sheets.add(self.name, after=workbook[-1].xw_sheet)
-            dest_sheet.name = self.name
+            dest_sheet = workbook.Worksheets.Add(After=workbook.Sheets(workbook.Sheets.Count))
+            dest_sheet.Name = self.name
             # for each item, dump data + generate associated graphical items
             for item in self.items:
                 data_row = item.dump(dest_sheet, data_sheet, data_row)
@@ -644,14 +642,14 @@ def new_sheet(self, sheet_name):
 
         def to_excel(self, filepath, data_sheet_name='__data__', overwrite=True):
             with open_excel(filepath, overwrite_file=overwrite) as wb:
-                app = wb.app.api
-                # it's a > x7 speed up difference
-                app.ScreenUpdating = False
+                # from here on, we use pure win32com objects instead of
+                # larray.excel or xlwings objects as this is faster
+                xl_wb = wb.api
 
                 # dump items for each output sheet
                 data_sheet_row = 1
                 for sheet in self.sheets.values():
-                    data_sheet_row = sheet._to_excel(wb, data_sheet_row)
+                    data_sheet_row = sheet._to_excel(xl_wb, data_sheet_row)
                 wb.save()
                 # reset
                 self.sheets.clear()