Added stacked and percentr stacked line charts.

Added LXW_CHART_LINE_STACKED and LXW_CHART_LINE_STACKED_PERCENT
line charts subtypes.

docs/src/examples.dox

@@ -690,11 +690,17 @@ Percent stacked column chart:
 </tr>
 </table>
 
-Example of creating an Excel Line chart.
+Example of creating Excel Line charts. Three types of line chart are shown.
 
 The default line chart:
 @image html chart_line1.png
 
+Stacked line chart:
+@image html chart_line2.png
+
+Percent stacked line chart:
+@image html chart_line3.png
+
 
 
 

docs/src/examples.txt

@@ -321,11 +321,17 @@ Percent stacked column chart:
 ##############################################################
 @example chart_line.c
 
-Example of creating an Excel Line chart.
+Example of creating Excel Line charts. Three types of line chart are shown.
 
 The default line chart:
 @image html chart_line1.png
 
+Stacked line chart:
+@image html chart_line2.png
+
+Percent stacked line chart:
+@image html chart_line3.png
+
 
 ##############################################################
 @example chart_scatter.c

examples/chart_line.c

@@ -81,5 +81,62 @@ int main() {
     worksheet_insert_chart(worksheet, CELL("E2"), chart);
 
 
+    /*
+     * Chart 2. Create a stacked line chart.
+     */
+    chart = workbook_add_chart(workbook, LXW_CHART_LINE_STACKED);
+
+    /* Add the first series to the chart. */
+    series = chart_add_series(chart, "=Sheet1!$A$2:$A$7", "=Sheet1!$B$2:$B$7");
+
+    /* Set the name for the series instead of the default "Series 1". */
+    chart_series_set_name(series, "=Sheet1!$B$1");
+
+    /* Add the second series to the chart. */
+    series = chart_add_series(chart, "=Sheet1!$A$2:$A$7", "=Sheet1!$C$2:$C$7");
+
+    /* Set the name for the series instead of the default "Series 2". */
+    chart_series_set_name(series, "=Sheet1!$C$1");
+
+    /* Add a chart title and some axis labels. */
+    chart_title_set_name(chart,        "Results of sample analysis");
+    chart_axis_set_name(chart->x_axis, "Test number");
+    chart_axis_set_name(chart->y_axis, "Sample length (mm)");
+
+    /* Set an Excel chart style. */
+    chart_set_style(chart, 12);
+
+    /* Insert the chart into the worksheet. */
+    worksheet_insert_chart(worksheet, CELL("E18"), chart);
+
+
+    /*
+     * Chart 3. Create a percent stacked line chart.
+     */
+    chart = workbook_add_chart(workbook, LXW_CHART_LINE_STACKED_PERCENT);
+
+    /* Add the first series to the chart. */
+    series = chart_add_series(chart, "=Sheet1!$A$2:$A$7", "=Sheet1!$B$2:$B$7");
+
+    /* Set the name for the series instead of the default "Series 1". */
+    chart_series_set_name(series, "=Sheet1!$B$1");
+
+    /* Add the second series to the chart. */
+    series = chart_add_series(chart, "=Sheet1!$A$2:$A$7", "=Sheet1!$C$2:$C$7");
+
+    /* Set the name for the series instead of the default "Series 2". */
+    chart_series_set_name(series, "=Sheet1!$C$1");
+
+    /* Add a chart title and some axis labels. */
+    chart_title_set_name(chart,        "Results of sample analysis");
+    chart_axis_set_name(chart->x_axis, "Test number");
+    chart_axis_set_name(chart->y_axis, "Sample length (mm)");
+
+    /* Set an Excel chart style. */
+    chart_set_style(chart, 13);
+
+    /* Insert the chart into the worksheet. */
+    worksheet_insert_chart(worksheet, CELL("E34"), chart);
+
     return workbook_close(workbook);
 }

include/xlsxwriter/chart.h

@@ -124,6 +124,12 @@ typedef enum lxw_chart_type {
     /** Line chart. */
     LXW_CHART_LINE,
 
+    /** Line chart - stacked. */
+    LXW_CHART_LINE_STACKED,
+
+    /** Line chart - percentage stacked. */
+    LXW_CHART_LINE_STACKED_PERCENT,
+
     /** Pie chart. */
     LXW_CHART_PIE,
 

include/xlsxwriter/workbook.h

@@ -557,6 +557,8 @@ lxw_format *workbook_add_format(lxw_workbook *workbook);
  * | #LXW_CHART_COLUMN_STACKED_PERCENT        | Column chart - percentage stacked.     |
  * | #LXW_CHART_DOUGHNUT                      | Doughnut chart.                        |
  * | #LXW_CHART_LINE                          | Line chart.                            |
+ * | #LXW_CHART_LINE_STACKED                  | Line chart - stacked.                  |
+ * | #LXW_CHART_LINE_STACKED_PERCENT          | Line chart - percentage stacked.       |
  * | #LXW_CHART_PIE                           | Pie chart.                             |
  * | #LXW_CHART_SCATTER                       | Scatter chart.                         |
  * | #LXW_CHART_SCATTER_STRAIGHT              | Scatter chart - straight.              |

src/chart.c

@@ -4784,7 +4784,7 @@ _chart_initialize_doughnut_chart(lxw_chart *self)
  * Initialize a line chart.
  */
 STATIC void
-_chart_initialize_line_chart(lxw_chart *self)
+_chart_initialize_line_chart(lxw_chart *self, uint8_t type)
 {
     self->chart_group = LXW_CHART_LINE;
     _chart_set_default_marker_type(self, LXW_CHART_MARKER_NONE);
@@ -4793,6 +4793,17 @@ _chart_initialize_line_chart(lxw_chart *self)
     self->y_axis->is_value = LXW_TRUE;
     self->default_label_position = LXW_CHART_LABEL_POSITION_RIGHT;
 
+    if (type == LXW_CHART_LINE_STACKED) {
+        self->grouping = LXW_GROUPING_STACKED;
+        self->subtype = LXW_CHART_SUBTYPE_STACKED;
+    }
+
+    if (type == LXW_CHART_LINE_STACKED_PERCENT) {
+        self->grouping = LXW_GROUPING_PERCENTSTACKED;
+        _chart_axis_set_default_num_format(self->y_axis, "0%");
+        self->subtype = LXW_CHART_SUBTYPE_STACKED;
+    }
+
     /* Initialize the function pointers for this chart type. */
     self->write_chart_type = _chart_write_line_chart;
     self->write_plot_area = _chart_write_plot_area;
@@ -4887,7 +4898,9 @@ _chart_initialize(lxw_chart *self, uint8_t type)
             break;
 
         case LXW_CHART_LINE:
-            _chart_initialize_line_chart(self);
+        case LXW_CHART_LINE_STACKED:
+        case LXW_CHART_LINE_STACKED_PERCENT:
+            _chart_initialize_line_chart(self, type);
             break;
 
         case LXW_CHART_PIE:

test/functional/src/test_chart_line05.c

@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Test to compare output against Excel files.
+ *
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = workbook_new("test_chart_line05.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+    lxw_chart     *chart     = workbook_add_chart(workbook, LXW_CHART_LINE_STACKED);
+
+    /* For testing, copy the randomly generated axis ids in the target file. */
+    chart->axis_id_1 = 108321408;
+    chart->axis_id_2 = 108634112;
+
+    uint8_t data[5][3] = {
+        {1, 2,  3},
+        {2, 4,  6},
+        {3, 6,  9},
+        {4, 8,  12},
+        {5, 10, 15}
+    };
+
+    int row, col;
+    for (row = 0; row < 5; row++)
+        for (col = 0; col < 3; col++)
+            worksheet_write_number(worksheet, row, col, data[row][col], NULL);
+
+    chart_add_series(chart, NULL, "=Sheet1!$A$1:$A$5");
+    chart_add_series(chart, NULL, "=Sheet1!$B$1:$B$5");
+    chart_add_series(chart, NULL, "=Sheet1!$C$1:$C$5");
+
+    worksheet_insert_chart(worksheet, CELL("E9"), chart);
+
+    return workbook_close(workbook);
+}

test/functional/src/test_chart_line06.c

@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Test to compare output against Excel files.
+ *
+ * Copyright 2014-2020, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = workbook_new("test_chart_line06.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+    lxw_chart     *chart     = workbook_add_chart(workbook, LXW_CHART_LINE_STACKED_PERCENT);
+
+    /* For testing, copy the randomly generated axis ids in the target file. */
+    chart->axis_id_1 = 108321408;
+    chart->axis_id_2 = 108634112;
+
+    uint8_t data[5][3] = {
+        {1, 2,  3},
+        {2, 4,  6},
+        {3, 6,  9},
+        {4, 8,  12},
+        {5, 10, 15}
+    };
+
+    int row, col;
+    for (row = 0; row < 5; row++)
+        for (col = 0; col < 3; col++)
+            worksheet_write_number(worksheet, row, col, data[row][col], NULL);
+
+    chart_add_series(chart, NULL, "=Sheet1!$A$1:$A$5");
+    chart_add_series(chart, NULL, "=Sheet1!$B$1:$B$5");
+    chart_add_series(chart, NULL, "=Sheet1!$C$1:$C$5");
+
+    worksheet_insert_chart(worksheet, CELL("E9"), chart);
+
+    return workbook_close(workbook);
+}

test/functional/test_chart_line.py

@@ -21,3 +21,9 @@ class TestCompareXLSXFiles(base_test_class.XLSXBaseTest):
 
     def test_chart_line04(self):
         self.run_exe_test('test_chart_line04')
+
+    def test_chart_line05(self):
+        self.run_exe_test('test_chart_line05')
+
+    def test_chart_line06(self):
+        self.run_exe_test('test_chart_line06')