Initial working radar charts.

include/xlsxwriter/chart.h

@@ -76,7 +76,14 @@ enum lxw_chart_types {
     /** Scatter chart - smooth with markers. */
     LXW_CHART_SCATTER_SMOOTH_WITH_MARKERS,
 
-    LWX_CHART_END_REMOVEP_LATER
+    /** RAdar chart. */
+    LXW_CHART_RADAR,
+
+    /** RAdar chart - with markers. */
+    LXW_CHART_RADAR_WITH_MARKERS,
+
+    /** RAdar chart - filled. */
+    LXW_CHART_RADAR_FILLED
 };
 
 enum lxw_chart_subtypes {
@@ -120,6 +127,9 @@ typedef struct lxw_axis {
     char num_format[LXW_CHART_NUM_FORMAT_LEN];
     char default_num_format[LXW_CHART_NUM_FORMAT_LEN];
 
+    uint8_t default_major_gridlines;
+    uint8_t major_tick_mark;
+
 } lxw_axis;
 
 /*

src/chart.c

@@ -50,6 +50,9 @@ lxw_chart_new(uint8_t type)
     strcpy(chart->x_axis.default_num_format, "General");
     strcpy(chart->y_axis.default_num_format, "General");
 
+    chart->x_axis.default_major_gridlines = LXW_FALSE;
+    chart->y_axis.default_major_gridlines = LXW_TRUE;
+
     chart->series_overlap_1 = 100;
 
     return chart;
@@ -237,6 +240,27 @@ _chart_write_grouping(lxw_chart *self, char *grouping)
     LXW_FREE_ATTRIBUTES();
 }
 
+/*
+ * Write the <c:radarStyle> element.
+ */
+STATIC void
+_chart_write_radar_style(lxw_chart *self, uint8_t type)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    LXW_INIT_ATTRIBUTES();
+
+    if (type == LXW_CHART_RADAR_FILLED)
+        LXW_PUSH_ATTRIBUTES_STR("val", "filled");
+    else
+        LXW_PUSH_ATTRIBUTES_STR("val", "marker");
+
+    lxw_xml_empty_tag(self->file, "c:radarStyle", &attributes);
+
+    LXW_FREE_ATTRIBUTES();
+}
+
 /*
  * Write the <c:varyColors> element.
  */
@@ -563,6 +587,26 @@ _chart_write_format_code(lxw_chart *self)
     lxw_xml_data_element(self->file, "c:formatCode", "General", NULL);
 }
 
+/*
+ * Write the <c:majorTickMark> element.
+ */
+STATIC void
+_chart_write_major_tick_mark(lxw_chart *self, lxw_axis *axis)
+{
+    struct xml_attribute_list attributes;
+    struct xml_attribute *attribute;
+
+    if (!axis->major_tick_mark)
+        return;
+
+    LXW_INIT_ATTRIBUTES();
+    LXW_PUSH_ATTRIBUTES_STR("val", "cross");
+
+    lxw_xml_empty_tag(self->file, "c:majorTickMark", &attributes);
+
+    LXW_FREE_ATTRIBUTES();
+}
+
 /*
  * Write the <c:numCache> element.
  */
@@ -1015,9 +1059,11 @@ _chart_write_lbl_offset(lxw_chart *self)
  * Write the <c:majorGridlines> element.
  */
 STATIC void
-_chart_write_major_gridlines(lxw_chart *self)
+_chart_write_major_gridlines(lxw_chart *self, lxw_axis *axis)
 {
-    lxw_xml_empty_tag(self->file, "c:majorGridlines", NULL);
+
+    if (axis->default_major_gridlines)
+        lxw_xml_empty_tag(self->file, "c:majorGridlines", NULL);
 }
 
 /*
@@ -1215,10 +1261,16 @@ _chart_write_cat_axis(lxw_chart *self)
     /* Write the c:axPos element. */
     _chart_write_axis_pos(self, position);
 
+    /* Write the c:majorGridlines element. */
+    _chart_write_major_gridlines(self, &self->x_axis);
+
     /* Write the c:numFmt element. */
     if (self->cat_has_num_fmt)
         _chart_write_number_format(self, &self->x_axis);
 
+    /* Write the c:majorTickMark element. */
+    _chart_write_major_tick_mark(self, &self->x_axis);
+
     /* Write the c:tickLblPos element. */
     _chart_write_tick_lbl_pos(self);
 
@@ -1259,11 +1311,14 @@ _chart_write_val_axis(lxw_chart *self)
     _chart_write_axis_pos(self, position);
 
     /* Write the c:majorGridlines element. */
-    _chart_write_major_gridlines(self);
+    _chart_write_major_gridlines(self, &self->y_axis);
 
     /* Write the c:numFmt element. */
     _chart_write_number_format(self, &self->y_axis);
 
+    /* Write the c:majorTickMark element. */
+    _chart_write_major_tick_mark(self, &self->y_axis);
+
     /* Write the c:tickLblPos element. */
     _chart_write_tick_lbl_pos(self);
 
@@ -1300,6 +1355,9 @@ _chart_write_cat_val_axis(lxw_chart *self)
     /* Write the c:numFmt element. */
     _chart_write_number_format(self, &self->y_axis);
 
+    /* Write the c:majorTickMark element. */
+    _chart_write_major_tick_mark(self, &self->y_axis);
+
     /* Write the c:tickLblPos element. */
     _chart_write_tick_lbl_pos(self);
 
@@ -1586,6 +1644,41 @@ _chart_write_scatter_chart(lxw_chart *self)
     lxw_xml_end_tag(self->file, "c:scatterChart");
 }
 
+/*
+ * Write a radar chart.
+ */
+STATIC void
+_chart_write_radar_chart(lxw_chart *self, uint8_t type)
+{
+    lxw_chart_series *series;
+
+    if (type == LXW_CHART_RADAR)
+        self->has_markers = LXW_TRUE;
+
+    self->x_axis.default_major_gridlines = LXW_TRUE;
+    self->y_axis.major_tick_mark = LXW_TRUE;
+
+    lxw_xml_start_tag(self->file, "c:radarChart", NULL);
+
+    /* Write the c:radarStyle element. */
+    _chart_write_radar_style(self, type);
+
+    STAILQ_FOREACH(series, self->series_list, list_pointers) {
+        /* Write the c:ser element. */
+        _chart_write_ser(self, series);
+    }
+
+    if (self->has_overlap) {
+        /* Write the c:overlap element. */
+        _chart_write_overlap(self, self->series_overlap_1);
+    }
+
+    /* Write the c:axId elements. */
+    _chart_write_axis_ids(self);
+
+    lxw_xml_end_tag(self->file, "c:radarChart");
+}
+
 /*****************************************************************************
  * End of sub chart functions.
  */
@@ -1636,6 +1729,12 @@ _chart_write_chart_type(lxw_chart *self, uint8_t type)
             _chart_write_scatter_chart(self);
             break;
 
+        case LXW_CHART_RADAR:
+        case LXW_CHART_RADAR_WITH_MARKERS:
+        case LXW_CHART_RADAR_FILLED:
+            _chart_write_radar_chart(self, type);
+            break;
+
         default:
             LXW_WARN_FORMAT("workbook_add_chart(): "
                             "unhandled chart type '%d'", type);
@@ -1851,11 +1950,11 @@ chart_set_style(lxw_chart *self, uint8_t style_id)
 void
 chart_set_rotation(lxw_chart *self, uint16_t rotation)
 {
-    if (rotation >= 0 && rotation <= 360)
+    if (rotation <= 360)
         self->rotation = rotation;
     else
-        LXW_WARN_FORMAT("chart_set_rotation(): Chart rotation '%d' outside"
-                        " range: 0 <= rotation <= 360", rotation);
+        LXW_WARN_FORMAT("chart_set_rotation(): Chart rotation '%d' outside "
+                        "range: 0 <= rotation <= 360", rotation);
 }
 
 /*

test/functional/src/test_chart_radar01.c

@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Test to compare output against Excel files.
+ *
+ * Copyright 2014-2015, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_chart_radar01.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+    lxw_chart     *chart     = workbook_add_chart(workbook, LXW_CHART_RADAR);
+
+    /* For testing, copy the randomly generated axis ids in the target file. */
+    chart->axis_id_1 = 56801152;
+    chart->axis_id_2 = 56802688;
+
+    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_radar02.c

@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Test to compare output against Excel files.
+ *
+ * Copyright 2014-2015, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_chart_radar02.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+    lxw_chart     *chart     = workbook_add_chart(workbook, LXW_CHART_RADAR_WITH_MARKERS);
+
+    /* For testing, copy the randomly generated axis ids in the target file. */
+    chart->axis_id_1 = 48543616;
+    chart->axis_id_2 = 48545152;
+
+    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_radar03.c

@@ -0,0 +1,42 @@
+/*****************************************************************************
+ * Test cases for libxlsxwriter.
+ *
+ * Test to compare output against Excel files.
+ *
+ * Copyright 2014-2015, John McNamara, jmcnamara@cpan.org
+ *
+ */
+
+#include "xlsxwriter.h"
+
+int main() {
+
+    lxw_workbook  *workbook  = new_workbook("test_chart_radar03.xlsx");
+    lxw_worksheet *worksheet = workbook_add_worksheet(workbook, NULL);
+    lxw_chart     *chart     = workbook_add_chart(workbook, LXW_CHART_RADAR_FILLED);
+
+    /* For testing, copy the randomly generated axis ids in the target file. */
+    chart->axis_id_1 = 56802304;
+    chart->axis_id_2 = 56845440;
+
+    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_radar.py

@@ -0,0 +1,24 @@
+###############################################################################
+#
+# Tests for libxlsxwriter.
+#
+# Copyright 2014-2016, John McNamara, jmcnamara@cpan.org
+#
+
+import base_test_class
+
+class TestCompareXLSXFiles(base_test_class.XLSXBaseTest):
+    """
+    Test file created with libxlsxwriter against a file created by Excel.
+
+    """
+
+    def test_chart_radar01(self):
+        self.run_exe_test('test_chart_radar01')
+
+    def test_chart_radar02(self):
+        self.run_exe_test('test_chart_radar02')
+
+    def test_chart_radar03(self):
+        self.run_exe_test('test_chart_radar03')
+