Skip to content

C
c3-closed
Commit 50bd61a0 authored by Masayuki Tanaka's avatar Masayuki Tanaka
Browse files
Options

Fix axis.x.default

parent e30d1df8
Hide whitespace changes
Inline Side-by-side
Showing with 64 additions and 10 deletions
c3.js
View file @ 50bd61a0
......@@ -253,9 +253,7 @@
.on("dblclick.zoom", null);
// Set default extent if defined
if (config.axis_x_default) {
$$.brush.extent(isFunction(config.axis_x_default) ? config.axis_x_default($$.getXDomain($$.data.targets)) : config.axis_x_default);
}
if (config.axis_x_default) { $$.brush.extent($$.getDefaultExtent()); }
// Add Axis
$$.initAxis();
......@@ -4915,6 +4913,14 @@
$$.context.attr("transform", $$.getTranslate('context'));
subXAxis.attr("transform", $$.getTranslate('subx'));
};
c3_chart_internal_fn.getDefaultExtent = function () {
var $$ = this, config = $$.config,
extent = isFunction(config.axis_x_default) ? config.axis_x_default($$.getXDomain($$.data.targets)) : config.axis_x_default;
if ($$.isTimeSeries()) {
extent = [$$.parseDate(extent[0]), $$.parseDate(extent[1])];
}
return extent;
};
c3_chart_internal_fn.initZoom = function () {
var $$ = this, d3 = $$.d3, config = $$.config;
......
c3.min.js
View file @ 50bd61a0
This source diff could not be displayed because it is too large. You can view the blob instead.
htdocs/samples/subchart.html
View file @ 50bd61a0
......@@ -5,6 +5,7 @@
<body>
<div id="chart1"></div>
<div id="chart2"></div>
<div id="chart3"></div>
<script src="http://d3js.org/d3.v3.min.js" charset="utf-8"></script>
<script src="/js/c3.js"></script>
......@@ -41,6 +42,26 @@
}
});
var chart3 = c3.generate({
bindto: '#chart3',
data: {
columns: [
['data1', 30, 200, 100, 400, 150, 250],
['data2', 50, 20, 10, 40, 15, 25]
],
labels: true
},
axis: {
x: {
default: [3, 5]
}
},
subchart: {
show: true
},
});
</script>
</body>
</html>
htdocs/samples/zoom.html
View file @ 50bd61a0
......@@ -3,26 +3,47 @@
<link rel="stylesheet" type="text/css" href="/css/c3.css">
</head>
<body>
<div id="chart"></div>
<div id="chart1"></div>
<button onclick="load()">Load</button>
<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 chart = c3.generate({
bindto: '#chart',
var chart1 = c3.generate({
bindto: '#chart1',
data: {
columns: [
generateData(100)
],
},
axis: {
x: {
default: [30, 60]
}
},
zoom: { enabled: true },
subchart: { show: true }
});
var chart2 = c3.generate({
bindto: '#chart2',
data: {
columns: [
generateData(100)
],
},
axis: {
x: {
default: [30, 60]
}
},
zoom: { enabled: true },
});
function load() {
chart.load({
chart1.load({
columns: [
generateData(Math.random() * 1000)
],
......
src/core.js
View file @ 50bd61a0
......@@ -248,9 +248,7 @@ c3_chart_internal_fn.initWithData = function (data) {
.on("dblclick.zoom", null);
// Set default extent if defined
if (config.axis_x_default) {
$$.brush.extent(isFunction(config.axis_x_default) ? config.axis_x_default($$.getXDomain($$.data.targets)) : config.axis_x_default);
}
if (config.axis_x_default) { $$.brush.extent($$.getDefaultExtent()); }
// Add Axis
$$.initAxis();
......
src/subchart.js
View file @ 50bd61a0
......@@ -181,3 +181,11 @@ c3_chart_internal_fn.transformContext = function (withTransition, transitions) {
$$.context.attr("transform", $$.getTranslate('context'));
subXAxis.attr("transform", $$.getTranslate('subx'));
};
c3_chart_internal_fn.getDefaultExtent = function () {
var $$ = this, config = $$.config,
extent = isFunction(config.axis_x_default) ? config.axis_x_default($$.getXDomain($$.data.targets)) : config.axis_x_default;
if ($$.isTimeSeries()) {
extent = [$$.parseDate(extent[0]), $$.parseDate(extent[1])];
}
return extent;
};
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment