Fix axis.x.tick.values for timeseries - #408

10 years ago · bab6c75f16
5 changed files with 68 additions and 2 deletions
--- a/c3.js
+++ b/c3.js
@ -3744,6 +3744,10 @@
        var $$ = this, config = $$.config,
            axis = c3_axis($$.d3, $$.isCategorized()).scale(scale).orient(orient);

+        if ($$.isTimeSeries() && tickValues) {
+            tickValues = tickValues.map(function (v) { return $$.parseDate(v); });
+        }
+
        // Set tick
        axis.tickFormat(tickFormat).tickValues(tickValues);
        if ($$.isCategorized()) {
--- a/c3.min.js
+++ b/c3.min.js
--- a/htdocs/index.html
+++ b/htdocs/index.html
@ -142,6 +142,9 @@
            </div>
            <div class="col-md-4">
              <h3>X Axis Tick</h3>
+              <a href="./samples/axes_x_tick_values.html">
+                Set values for x axis
+              </a>
              <a href="./samples/axes_x_tick_culling.html">
                Set culling for x axis
              </a>
--- a/htdocs/samples/axes_x_tick_values.html
+++ b/htdocs/samples/axes_x_tick_values.html
@ -0,0 +1,55 @@
+<html>
+  <head>
+    <link rel="stylesheet" type="text/css" href="/css/c3.css">
+  </head>
+  <body>
+    <div id="chart1"></div>
+    <div id="chart2"></div>
+
+    <script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
+    <script src="/js/c3.js"></script>
+    <script>
+
+      var chart1 = c3.generate({
+        bindto: '#chart1',
+        data: {
+          columns: [
+            ['data1', 30, 200, 100, 400, 150, 250],
+            ['data2', 50, 20, 10, 40, 15, 25]
+          ],
+        },
+        axis: {
+          x : {
+            tick: {
+              values: [2, 4]
+            }
+          }
+        }
+      });
+
+      var chart2 = c3.generate({
+        bindto: '#chart2',
+        data: {
+          x : 'date',
+          xFormat : '%Y%m%d',
+          columns: [
+            ['date', '20130101', '20130102', '20130103', '20130104', '20130105', '20130106'],
+            ['sample', 30, 200, 100, 400, 150, 250],
+            ['sample2', 130, 300, 200, 450, 250, 350]
+          ]
+        },
+        axis : {
+          x : {
+            type : 'timeseries',
+            tick : {
+              format : "%e %b %y", // https://github.com/mbostock/d3/wiki/Time-Formatting#wiki-format
+              values: ['20130103', '20130104']
+            }
+          }
+        }
+      });
+      
+
+    </script>
+  </body>
+</html>
--- a/src/axis.js
+++ b/src/axis.js
@ -34,6 +34,10 @@ c3_chart_internal_fn.getXAxis = function (scale, orient, tickFormat, tickValues)
    var $$ = this, config = $$.config,
        axis = c3_axis($$.d3, $$.isCategorized()).scale(scale).orient(orient);

+    if ($$.isTimeSeries() && tickValues) {
+        tickValues = tickValues.map(function (v) { return $$.parseDate(v); });
+    }
+
    // Set tick
    axis.tickFormat(tickFormat).tickValues(tickValues);
    if ($$.isCategorized()) {